⚠️ CONFLICT! Lineage pull request for: skeleton - #193
Draft
cisagovbot wants to merge 45 commits into
Draft
Conversation
This is no longer necessary now that pygments 2.20.0 has been released. Resolves cisagov/skeleton-generic#257.
This exclude is uncommented in multiple downstream repos that use pipenv to simply allow it format those files however it wants; we don't care about prettifying them since they are for the most part only read by machines.
This should have been done in cisagov/skeleton-generic#249 but was not.
The changes we need were merged and a new release including them was cut. As a result we can resume installing terraform-docs from the official repository.
These ignore directives are commented out in this repository but should be uncommented in repositories that inherit from this skeleton.
There is no Python code in this repository, so users are unlikely to be interacting with a Python prompt. Co-authored-by: Nick M <50747025+mcdonnnj@users.noreply.github.com>
There is no Terraform code in this repository, so including such a section results in needless Dependabot runs that fail anyway. For example, see: https://github.com/cisagov/skeleton-generic/actions/runs/24689486456 Co-authored-by: Nick M <50747025+mcdonnnj@users.noreply.github.com>
Adjust the step that gets the Go cache directory to also get the Go module cache directory. Update the cache step for these changes and add the Go module cache to the paths that it caches. This should improve Go activities such as `go install`.
This will generate a single hash from all files listed.
These labels are intended to be used to mark when PRs call for a major, minor, or patch version bump. Use of these labels should make it easier to determine the necessary version bump when creating a release that involves multiple PRs; simply note the label corresponding to the highest version bump and bump the version accordingly.
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4 to 5. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@v4...v5) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
Now that the changes to work nicely with our configuration have been merged and released it makes sense to add a pre-commit hook to automatically update the READMEs for any Terraform configurations.
This modified hook will run against Packer templates. Since we use HCL for our Packer templates we can leverage `terraform-docs` to generate documentation. We must modify the default hook settings to run against Packer templates to achieve this.
Bumps [cisagov/setup-env-github-action](https://github.com/cisagov/setup-env-github-action) from 1 to 2. - [Release notes](https://github.com/cisagov/setup-env-github-action/releases) - [Commits](cisagov/setup-env-github-action@v1...v2) --- updated-dependencies: - dependency-name: cisagov/setup-env-github-action dependency-version: '2' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This choice should help with PRs such as cisagov/skeleton-generic#279 and cisagov/code-gov-update#311, where previously Dependabot wanted to incorrectly force the new version as a lower bound constraint into the Pipfile or requirements.txt file. According to the AIs: You would choose increase-if-necessary over lockfile-only when you want Dependabot to automatically update your manifest file (e.g., package.json, Cargo.toml) whenever a new dependency version falls outside your currently defined semantic version (semver) range. It makes sense to use lockfile-only instead of increase-if-necessary when your primary goal is to minimize manifest churn and you prefer to handle major or breaking dependency upgrades manually. Choose lockfile-only if: - You only want automated PRs for security and bug fixes. - You want zero changes to your main manifest file from bots. - You prefer upgrading major tools (like upgrading from Webpack 4 to 5) manually. Choose increase-if-necessary if: - You want the bot to handle both security patches and major version upgrades automatically. Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6 to 7. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ts-vuln Stop ignoring `pygments` vulnerability
…file Add a commented-out `exclude` for `Pipfile.lock` to the `pretty-format-json` `pre-commit` hook
Explain why we include a lower bound pin for setuptools
…rm-docs_releases_again Use official `terraform-docs` releases again
…ies-in-skeleton Let Dependabot handle Python dependencies in skeleton and comment out Terraform portion from Dependabot configuration
Cache the Go module cache in the `build.yml` workflow
Add major, minor, and patch labels
…s/dependency-review-action-5 Bump actions/dependency-review-action from 4 to 5
…hes_in_gha Consolidate `hashFiles()` calls in the `build.yml` workflow
We are still using Python 3.13 in our GitHub Actions configuration, but after version v26.1.1 of this pre-commit hook language_version is (somewhat unnecessarily but understandably[1]) hard coded to Python 3.14. ansible-lint itself currently supports Python>=3.10[2]. Note that this version must stay in sync with the Python version specified in cisagov/setup-env-github-action[3]. [1]: ansible/ansible-lint#4812 (comment) [2]: https://github.com/ansible/ansible-lint/blob/eefc3626bb341032d5a80288735cca6441c9c873/pyproject.toml#L9 [3]: https://github.com/cisagov/setup-env-github-action/blob/8567c2291ccdf5b84c297b487f592606f3af214f/src/versions.js#L27
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…-pre-commit-hook Upgrade and override `language_version` for the `ansible-lint` `pre-commit` hook
…_for_terraform-docs Add pre-commit hooks to use terraform-docs
…v/setup-env-github-action-2 Bump cisagov/setup-env-github-action from 1 to 2
…s/setup-go-7 Bump actions/setup-go from 6 to 7
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…s/checkout-7 Bump actions/checkout from 6 to 7
…rategy-for-pip Switch `versioning-strategy` to `increase-if-necessary` for `pip` section of Dependabot configuration
Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v5...v6) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…s/cache-6 Bump actions/cache from 5 to 6
Bumps [actions/labeler](https://github.com/actions/labeler) from 6 to 7. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@v6...v7) --- updated-dependencies: - dependency-name: actions/labeler dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…s/setup-python-7 Bump actions/setup-python from 6 to 7
…s/labeler-7 Bump actions/labeler from 6 to 7
Note that I chose not to include the upgrade of https://github.com/PyCQA/isort from 8.0.1 to 9.0.0b1 since it is a beta release.
…ok-versions Update `pre-commit` hook versions via `pre-commit autoupdate`
# Conflicts: # .github/dependabot.yml # .github/workflows/build.yml # requirements-dev.txt # requirements.txt
cisagovbot
added
the
upstream update
github-actions
Bot
added
dependencies
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.gitRemote branch:
HEADCheck the changes in this pull request to ensure they won't cause issues with your project.
The
lineage/skeletonbranch has one or more unresolved merge conflicts that you must resolve before merging this pull request!How to resolve the conflicts
Take ownership of this pull request by removing any other assignees.
Clone the repository locally, and reapply the merge:
Review the changes displayed by the
statuscommand. Fix any conflicts and possibly incorrect auto-merges.After resolving each of the conflicts,
addyour changes to the branch,commit, andpushyour changes: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.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
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!
bump_versionscript if this repository is versioned and the changes in this PR warrant a version bump.✅ Pre-merge checklist
Remove any of the following that do not apply. These boxes should remain unchecked until the pull request has been approved.
✅ Post-merge checklist
Remove any of the following that do not apply.
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