Skip to content

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

Merged
jsf9k merged 62 commits intodevelopfrom
lineage/skeleton
Jan 7, 2026
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton#263
jsf9k merged 62 commits intodevelopfrom
lineage/skeleton

Conversation

@cisagovbot
Copy link

@cisagovbot cisagovbot commented Jan 1, 2026 •
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-docker.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 git@github.com:cisagov/code-gov-update.git code-gov-update cd code-gov-update git remote add skeleton https://github.com/cisagov/skeleton-docker.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 Dockerfile README.md tests/container_test.py  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
mcdonnnj and others added 30 commits October 9, 2025 23:50
@mcdonnnj
Apply the dependencies label for Pipfile changes
c4092f0 
Since the Pipfile and Pipfile.lock files define Python dependencies for the Lambda, any changed to either of these files should result in the `dependencies` label being applied.
@dependabot
Bump github/codeql-action from 3 to 4
59f893b 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
@mcdonnnj
Remove an unnecessary permission from the PR label workflow
a44c47d 
There should be no reason for the actions/labeler action to create new labels so we can remove the permission that would allow this to occur.
@jsf9k
Update VM dev distro email address
ac5d177
@jsf9k
Add a license badge
629a0cc
@mcdonnnj
Update the color used for the python label
e133119 
This updates the existing color, which was pulled from the Python logo, to the color used in the Python website's CSS for the "Python" item in the site's top menu.
@mcdonnnj
Update the color used for the javascript label
15771ca 
This reflects the value defined by JSConf and used in their unofficially official logo for JS.
@mcdonnnj
Update the color used for the typescript label
a7eeb15 
This reflects the color of the logo from the TypeScript branding page at https://www.typescriptlang.org/branding/.
@mcdonnnj
Update the color used for the ansible label
fb7a736 
This mirrors the value used as a background for the mango Ansible community mark logo found in the ansible/logos repository.
@mcdonnnj
Update the color used for the docker label
5503151 
This is the "Moby Blue" primary color as defined in the Docker brand guidelines color section found at https://www.docker.com/company/newsroom/media-resources/.
@mcdonnnj
Add a label and auto-label configuration for shell scripts
dc0d9a0 
Since we use shell scripts throughout our projects it makes sense to have a dedicated label.
@jsf9k
Remove needless blank line
586af7c
@mcdonnnj @dav3r
Improve a labeler configuration's explanatory comment
8b5f6d2 
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
@jsf9k
Rename .flake8 to pyproject.toml and update syntax
ad708bd 
We can configure all our Python tooling in a single pyproject.toml file. Note that using pyproject.toml to configure flake8 requires the addition of the flake8-pyproject Python library.
@jsf9k
Add flake8-pyproject as an additional dependency of the flake8 pre-co…
2a3bb8b 
…mmit hook This will ensure that, even when run as a pre-commit hook, flake8 reads its configuration from the pyproject.toml file.
@jsf9k
Move isort config to pyproject.toml file
a70cf3c
@jsf9k
Add pyproject.toml as a trigger for the test label
c1861e6 
Also remove .flake8 and .isort.cfg as triggers for the same label.
@jsf9k
Remove the .bandit.yml file
22c6f40 
This file was doing nothing due to its contents.
@jsf9k
Pin the flake8-pyproject dependency in the pre-commit configuration
15cb601 
The flake8-docstrings dependency is pinned, so this one should be too.
@jsf9k
Remove flake8-pyproject dependency from requirements-test.txt
bc6bf8c 
flake8 itself isn't installed here, so this dependency shouldn't be either. This jibes with the fact that we don't install flake8-docstrings (another dependency of the flake8 pre-commit hook) into the virtual environment either.
@jsf9k
Upgrade pre-commit hooks via pre-commit autoupdate
c7c0c0a
@jsf9k
Merge pull request #227 from cisagov/improvement/remove_unneeded_perm…
056d2e1 
…ission Remove an unnecessary permission from the PR label workflow
@jsf9k
Merge pull request #228 from cisagov/documentation/add-license-badge
895ff4f 
Add a license badge
@jsf9k
Merge pull request #229 from cisagov/improvement/update_label_colors
049543f 
Update some label color choices
@jsf9k
Merge pull request #231 from cisagov/improvement/add_label_configurat…
be1d94a 
…ion_for_shell_scripts Add a label and auto-label configuration for shell scripts
@jsf9k
Merge pull request #235 from cisagov/improvement/move-flake8-config-t…
4a1bb4d 
…o-pyproject-toml Move all Python tool configs to `pyproject.toml`
@jsf9k
Merge pull request #237 from cisagov/improvement/update-pre-commit-hooks
eed01ea 
Upgrade `pre-commit` hooks via `pre-commit autoupdate`
@jsf9k
Merge pull request #226 from cisagov/dependabot/github_actions/github…
8cb611d 
…/codeql-action-4 Bump github/codeql-action from 3 to 4
@mcdonnnj @jsf9k
Add a CodeQL badge to the README
2d88e72 
We added a CodeQL configuration in #202 but did not add a badge.
@jsf9k
Merge pull request #230 from cisagov/improvement/add_codeql_badge
7f52b02 
Add a CodeQL badge to the README
jsf9k added 2 commits December 31, 2025 14:37
@jsf9k
Merge pull request #261 from cisagov/dependabot/github_actions/action…
93415be 
…s/download-artifact-7 Bump actions/download-artifact from 5 to 7
@jsf9k
Merge pull request #262 from cisagov/dependabot/github_actions/action…
18f4516 
…s/upload-artifact-6 Bump actions/upload-artifact from 4 to 6
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jan 1, 2026
@github-actions github-actions bot added documentation This issue or pull request improves or adds to documentation dependencies Pull requests that update a dependency file docker Pull requests that update Docker code github-actions Pull requests that update GitHub Actions code python Pull requests that update Python code test This issue or pull request adds or otherwise modifies test code labels Jan 1, 2026
jsf9k and others added 2 commits January 2, 2026 11:35
@jsf9k
Upgrade some actions/checkout instances to v6
7a379bf 
These were missed when I merged in the upstream changes in cisagov/skeleton-docker#258.
@jsf9k
Merge pull request #265 from cisagov/bugfix/upgrade-some-checkout-act…
3b91845 
…ions-that-were-missed Upgrade some `actions/checkout` instances to `v6`
@jsf9k jsf9k unassigned dav3r and mcdonnnj Jan 7, 2026
@jsf9k jsf9k added this to CyHy System Jan 7, 2026
@jsf9k jsf9k moved this to In Progress in CyHy System Jan 7, 2026
@jsf9k jsf9k force-pushed the lineage/skeleton branch from 1ec08c4 to 613ee7f Compare January 7, 2026 19:33
@jsf9k jsf9k marked this pull request as ready for review January 7, 2026 19:42
@jsf9k jsf9k enabled auto-merge January 7, 2026 19:42
@jsf9k jsf9k merged commit 25ae432 into develop Jan 7, 2026
31 checks passed
@jsf9k jsf9k deleted the lineage/skeleton branch January 7, 2026 20:24
@github-project-automation github-project-automation bot moved this from In Progress to Done in CyHy System Jan 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file docker Pull requests that update Docker code documentation This issue or pull request improves or adds to documentation github-actions Pull requests that update GitHub Actions code python Pull requests that update Python code test This issue or pull request adds or otherwise modifies test code upstream update This issue or pull request pulls in upstream updates

4 participants

@cisagovbot @jsf9k @dav3r @mcdonnnj