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 #196

Open
wants to merge 136 commits into
base: develop
Choose a base branch
from
Open

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

wants to merge 136 commits into from

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Sep 25, 2024 •
edited by jsf9k
Loading

Lineage Pull Request: CONFLICT

Achtung!!!

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-docker.git skeleton-docker
cd skeleton-docker
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/workflows/build.yml 
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

  • ✌️ The conflicts in this pull request have been resolved.
  • All relevant type-of-change labels have been added.
  • 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

dependabot bot and others added 30 commits September 13, 2023 02:01
@dependabot
Bump crazy-max/ghaction-github-status from 3 to 4
b5e5c11 
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
Add a diagnostics job for the label syncing workflow
371179e 
Also add a runner hardening task to the labeler job.
@jsf9k @mcdonnnj
Make the dev team the owners of the linter configuration files
1f611fc 
Co-authored-by: Nick <[email protected]>
@jsf9k @mcdonnnj
Make dev team members the codeowners of the requirements*.txt and set…
c356768 
…up-env files

Co-authored-by: Nick <[email protected]>
@jsf9k @mcdonnnj
Explicitly list the linter config files the dev team should own
0195005 
@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
Bump hashicorp/setup-terraform from 2 to 3
b768a28 
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
9f31700 
We prefer block style to flow style for sequences and mappings in YAML.
@mcdonnnj
Alphabetize entries in the build workflow
696433a 
We prefer to alphabetize mapping keys in YAML documents whenever
possible.
@mcdonnnj
Add a merge_group trigger to the build workflow
6503a9e 
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
Bump actions/setup-go from 4 to 5
193e799 
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
Bump actions/setup-python from 4 to 5
5c84295 
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
Switch pre-commit hooks for running shfmt
4a63dbe 
This hook bundles the binaries for shfmt with a Python package which
removes the need to manually install the tool for the hook to function.
@mcdonnnj
Remove installation of shfmt in the build workflow
3236b1b 
The new pre-commit hook provides `shfmt` binaries so we no longer need
to ensure it is installed.
@mcdonnnj
Use long options for shfmt arguments
5ddb14d 
Since shfmt now supports long command line options we should use them
as that is our preference. The single quotes for the number of spaces
to indent is changed to double quotes to align with our usual quotation
style.
@mcdonnnj
Add additional shfmt options
8ecd957 
These options are baked into the functionality of the old hook but must
be explicitly declared for the new hook.
@mcdonnnj
Set the default shell for all run steps in the build workflow
242921b 
This sets the default shell for any run steps in the build workflow to
mirror our standard shellscript writing practices. In addition to
enabling our standard options it will also enable errtrace and print
any commands that are run which should make debugging/troubleshooting
more straightforward.
@mcdonnnj
Add linting with goimports to the pre-commit configuration
c7b18dc 
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.
Add ATX Header Support for terraform-docs
f6d9d6e 
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
544e478 
Co-authored-by: Nick <[email protected]>
@michaelsaki @jsf9k
Remove unnecessary capitalizations and fix grammar
f5fa0ff 
Co-authored-by: Shane Frasier <[email protected]>
@michaelsaki @mcdonnnj
Simplify steps in the build/install portion of workflow
36361dd 
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
Add TODO label
3711ebe
@michaelsaki
Move TODO and add link to the issue
d114fb4 
`TODO` was placed on the wrong comment block. Also I am adding a link to the issue for the TODO.
@michaelsaki @dav3r
Alphabetize switches
c907cfc 
Co-authored-by: dav3r <[email protected]>
Allow setup-env to specify Python version
48db3e3 
This commit is introducing 2 new flags
into the setup-env script. -l or
--list-versions will list available
Python versions and allow the user to
select a version interactively. The second
flag -v or --version will allow a user
to set the version if installed.
(e.g. ./setup-env -v 3.9.6)
@michaelsaki @jsf9k
Add /dev/null and remove TMPFILE
c10929a 
This makes the code a bit cleaner and still accomplishes the same functionality

Co-authored-by: Shane Frasier <[email protected]>
Place flags in the correct order for -r and -p
adada40
Remove unneccessary spacing
1861b9b
@michaelsaki @jsf9k
Alphabetize flags and descriptions
3f623e4 
Co-authored-by: Shane Frasier <[email protected]>
@jsf9k
Move misplaced exit
9497dc2 
If the Python version exists then we want the script to continue
execution.
@mcdonnnj
Merge pull request #186 from cisagov/improvement/switch_prettier_hook
f0e55b3 
Switch the `pre-commit` hook used to run `prettier`
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Sep 25, 2024
@jsf9k jsf9k assigned jsf9k and unassigned felddy, jsf9k, dav3r and mcdonnnj Sep 25, 2024
@jsf9k jsf9k added documentation This issue or pull request improves or adds to documentation github-actions Pull requests that update GitHub Actions code github_actions Pull requests that update GitHub Actions code labels Sep 25, 2024
@jsf9k
Upgrade bandit to 1.7.10
433001b 
We should use the same version of bandit throughout the pre-commit
configuration.
@jsf9k
Add whitespace to placate black pre-commit hook
0fa3931
@jsf9k
Upgrade instances of actions/cache to v4
54c8dcd
@jsf9k
Upgrade instance of actions/setup-python to v5
438b62f 
Also pull the Python version from steps.setup-env.outputs instead of
hardcoding it.
@jsf9k jsf9k marked this pull request as ready for review September 25, 2024 14:19
@jsf9k jsf9k requested a review from a team September 25, 2024 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dav3r dav3r dav3r approved these changes

@dv4harr10 dv4harr10 dv4harr10 approved these changes

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

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

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

Assignees

@jsf9k jsf9k

@mcdonnnj mcdonnnj

Labels
documentation This issue or pull request improves or adds to documentation github_actions Pull requests that update GitHub Actions code 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.
7 participants
@cisagovbot @dav3r @dv4harr10 @felddy @jsf9k @mcdonnnj @michaelsaki