Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⚠️ CONFLICT! Lineage pull request for: skeleton #308

Merged
merged 77 commits into from
Mar 7, 2024
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton #308

merged 77 commits into from
Mar 7, 2024

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Mar 6, 2024 •
edited by jsf9k
Loading

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-generic.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

  1. Take ownership of this pull request by removing any other assignees.

  2. Clone the repository locally, and reapply the merge:

    git clone [email protected]:cisagov/skeleton-packer.git skeleton-packer
cd skeleton-packer
git remote add skeleton https://github.com/cisagov/skeleton-generic.git
git remote set-url --push skeleton no_push
git switch develop
git switch --create lineage/skeleton --track origin/develop
git pull skeleton HEAD
git status

  3. Review the changes displayed by the status command. Fix any conflicts and
    possibly incorrect auto-merges.

  4. After resolving each of the conflicts, add your changes to the
    branch, commit, and push your changes:

    git add .github/CODEOWNERS 
git commit
git push --force --set-upstream origin lineage/skeleton

    Note that you may append to the default merge commit message
    that git creates for you, but please do not delete the existing
    content    . It provides useful information about the merge that is
    being performed.

  5. Wait for all the automated tests to pass.

  6. Confirm each item in the "Pre-approval checklist" below.

  7. Remove any of the checklist items that do not apply.

  8. Ensure every remaining checkbox has been checked.

  9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

Remove any of the following that do not apply. If you're unsure about
any of these, don't hesitate to ask. We're here to help!

  • ✌️ The conflicts in this pull request have been resolved.
  • All relevant type-of-change labels have been added.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • All new and existing tests pass.

Note

You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Mar 6, 2024
@jsf9k jsf9k force-pushed the lineage/skeleton branch from 52f2315 to b8c47d7 Compare March 6, 2024 15:07
@jsf9k
Copy link
Member

jsf9k commented Mar 6, 2024

This PR is failing linting because it requires #295. That PR should be merged before this one.

@jsf9k jsf9k added documentation This issue or pull request improves or adds to documentation github-actions Pull requests that update GitHub Actions code ansible Pull requests that update Ansible code labels Mar 6, 2024
@jsf9k jsf9k added the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Mar 6, 2024
dependabot bot and others added 13 commits March 7, 2024 08:58
@dependabot @mcdonnnj
Bump crazy-max/ghaction-github-status from 3 to 4
f7b0764 
Bumps [crazy-max/ghaction-github-status](https://github.com/crazy-max/ghaction-github-status) from 3 to 4.
- [Release notes](https://github.com/crazy-max/ghaction-github-status/releases)
- [Commits](crazy-max/ghaction-github-status@v3...v4)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-github-status
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@jsf9k @mcdonnnj
Add a diagnostics job for the label syncing workflow
5e90f7e 
Also add a runner hardening task to the labeler job.
@jsf9k @mcdonnnj
Make the dev team the owners of the linter configuration files
376ed23 
Co-authored-by: Nick <[email protected]>
@jsf9k @mcdonnnj
Make dev team members the codeowners of the requirements*.txt and set…
f894a16 
…up-env files

Co-authored-by: Nick <[email protected]>
@jsf9k @mcdonnnj
Explicitly list the linter config files the dev team should own
34471a6 
@mcdonnnj correctly pointed out that other projects add their own
configuration files that match, e.g., the /.*.yaml pattern.  We want
to ensure that we only own the linter configuration files from the
skeleton.

Co-authored-by: Nick <[email protected]>
@dependabot @mcdonnnj
Bump hashicorp/setup-terraform from 2 to 3
a732721 
Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 2 to 3.
- [Release notes](https://github.com/hashicorp/setup-terraform/releases)
- [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md)
- [Commits](hashicorp/setup-terraform@v2...v3)

---
updated-dependencies:
- dependency-name: hashicorp/setup-terraform
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@mcdonnnj
Prefer block style to flow style
c682d9a 
We prefer block style to flow style for sequences and mappings in YAML.
@mcdonnnj
Alphabetize entries in the build workflow
592b26c 
We prefer to alphabetize mapping keys in YAML documents whenever
possible.
@mcdonnnj
Add a merge_group trigger to the build workflow
780aa4d 
This should improve compatibility with merge queues. We configure it to
only trigger on the `checks_requested` type which is currently the only
supported type for this trigger. If additional types are added in the
future they should be added if appropriate.
@dependabot @mcdonnnj
Bump actions/setup-go from 4 to 5
8a8338a 
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @mcdonnnj
Bump actions/setup-python from 4 to 5
57d2993 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@mcdonnnj
Update pre-commit hook versions
56e160b 
This is done automatically with the `pre-commit autoupdate` command.
The pre-commit/mirrors-prettier was manually held back because the
latest tags are for alpha releases of the next major version.
@mcdonnnj
Manually update the prettier hook
0d000b2 
The hook is manually updated to the last v3 tag available from the
pre-commit/mirrors-prettier repository. We then add the latest release
of v3 available from NPM as an additional depdency.
mcdonnnj and others added 12 commits March 7, 2024 09:10
@mcdonnnj
Add linting with goimports to the pre-commit configuration
f4af1cf 
This will run the Go tool `goimports` against the repository if it
contains any Go files. This tool bundles the functionality of `go fmt`
with the additional benefit of sorting Go imports much like the isort
tool we use for Python code.
@mcdonnnj
Add ATX Header Support for terraform-docs
9c91c6a 
This is a temporary fix until @mcdonnnj has
his PR approved and merged into the terraform-docs
repo. This fix will perform a shallow clone of his
forked branch, build the binary, and install it.
@michaelsaki @mcdonnnj
Add prepended names to variables to describe their function
70d3b92 
Co-authored-by: Nick <[email protected]>
@michaelsaki @jsf9k @mcdonnnj
Remove unnecessary capitalizations and fix grammar
19dea0a 
Co-authored-by: Shane Frasier <[email protected]>
@michaelsaki @mcdonnnj
Simplify steps in the build/install portion of workflow
a3f6c30 
PATH is handled by `setup-go` so we can refactor the code setting it. Also we are taking advantage of the -C switch to handle building from the cloned repository.

Co-authored-by: Nick <[email protected]>
@michaelsaki @mcdonnnj
Add TODO label
84a8201
@michaelsaki @mcdonnnj
Move TODO and add link to the issue
74ddeec 
`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.
@michaelsaki @dav3r @mcdonnnj
Alphabetize switches
4aa54ba 
Co-authored-by: dav3r <[email protected]>
@mcdonnnj
Switch pre-commit hooks for running shellcheck
19789e5 
This hook bundles the binaries for shellcheck with a Python package
which removes the need to ensure the tool is installed for the hook to
function. It also ties the version of shellcheck used to the hook which
will help guarantee consistency.
@jsf9k @mcdonnnj
Reorder YAML keys to placate ansible-lint
7d12ea7
@jsf9k @mcdonnnj
Use Python version output from cisagov/setup-env-github-action
c584117
@jsf9k @mcdonnnj
Add whitespace change for Black linter/formatter
656c5ef
@mcdonnnj mcdonnnj marked this pull request as ready for review March 7, 2024 16:05
@jsf9k jsf9k requested a review from a team March 7, 2024 16:08
@jsf9k jsf9k removed the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Mar 7, 2024
dav3r
dav3r approved these changes Mar 7, 2024
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 👍

@mcdonnnj mcdonnnj added this pull request to the merge queue Mar 7, 2024
Merged via the queue into develop with commit 71f520c Mar 7, 2024
11 checks passed
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch March 7, 2024 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dv4harr10 dv4harr10 dv4harr10 approved these changes

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@dav3r dav3r dav3r approved these changes

@jasonodoom jasonodoom jasonodoom approved these changes

@jsf9k jsf9k jsf9k approved these changes

@felddy felddy Awaiting requested review from felddy felddy is a code owner

Assignees

@jsf9k jsf9k

@mcdonnnj mcdonnnj

Labels
ansible Pull requests that update Ansible code documentation This issue or pull request improves or adds to documentation github-actions Pull requests that update GitHub Actions code upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@cisagovbot @jsf9k @jasonodoom @dav3r @mcdonnnj @dv4harr10 @felddy @michaelsaki