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

cisagovbot · 2025-09-24T22:33:40Z

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

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

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

Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:
```
git add Dockerfile 
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.
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

✌️ 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

This adds a `ci` block to the pre-commit configurations to control the behavior of the pre-commit.ci GitHub app.

We currently use the `develop` branch as our reference for the cisagov/setup-env-github-action action in the build workflow. We will instead use the major version tag which puts our usage of this action in line with how we use other actions in our workflows.

This includes updating the dependabot configuration, adding a new `label-prs.yml` GitHub Actions workflow, and adding a suitable configuration file for the actions/labeler action used by the aforementioned workflow.

Bumps library/python from 3.13.5-alpine3.22 to 3.13.7-alpine3.22. --- updated-dependencies: - dependency-name: library/python dependency-version: 3.13.7-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/labeler](https://github.com/actions/labeler) from 5 to 6. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@v5...v6) --- updated-dependencies: - dependency-name: actions/labeler dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.33.0 to 0.33.1. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@0.33.0...0.33.1) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

Instead of using the default labels for the `github-actions` package ecosystem we specify the labels explicitly. This is done to ensure that dependabot uses our `github-actions` label instead of the default of `github_actions`. We must also explicitly specify the `dependencies` label since we are overriding the default label values.

This should produce dependabot PRs for Docker images defined in the Docker composition in this project.

Change the check from looking for specific text in the version output to using the `--test` option. This will provide a more robust implementation of this check that does not have to worry about output format stability. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Use a version tag for `cisagov/setup-env-github-action`

…s/setup-python-6 Bump actions/setup-python from 5 to 6

…s/setup-go-6 Bump actions/setup-go from 5 to 6

…-commit_config Add a configuration block for pre-commit.ci

Add a configuration to automatically label pull requests

…bels Adjust the labels dependabot uses for GitHub Actions updates

…eck_logic Adjust the logic used to check for GNU getopt in the `setup-env` script

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…s/checkout-5 Bump actions/checkout from 4 to 5

This is done automatically with the `pre-commit autoupdate` command.

A new rule, `MD059/descriptive-link-text`, was added in markdownlint's 0.38.0 release, which itself is used in v0.45.0 of markdownlint-cli. As such, we must update to conform to the new rule.

Update `pre-commit` hook versions

⚠️ CONFLICT! Lineage pull request for: skeleton

…keleton

This gets rid of two errors from our markdownlint pre-commit linter.

This is the version of Python currently offered by Alpine Linux 3.22, so this is a necessary change.

These packages are necessary to build the cffi wheel for the 386 platform.

jsf9k · 2025-10-20T17:41:52Z

@mcdonnnj - Do you think a version bump is warranted here, since we are now using Python 3.12.12? If so, would that be a patch bump?

dav3r · 2025-10-20T17:59:40Z

@mcdonnnj - Do you think a version bump is warranted here, since we are now using Python 3.12? If so, would that be a patch bump?

Do you mean now that we are moving from Python 3.12.11 to 3.12.12?

mcdonnnj · 2025-10-20T18:55:54Z

@mcdonnnj - Do you think a version bump is warranted here, since we are now using Python 3.12.12? If so, would that be a patch bump?

I would prefer to leave the version as-is so I can bump it in #229 this week and cut a new release after testing.

jsf9k · 2025-10-21T15:04:13Z

I would prefer to leave the version as-is so I can bump it in #229 this week and cut a new release after testing.

Can we still merge this one first and then you can rebase #229? I really don't want to rebase this one.

mcdonnnj · 2025-10-21T20:57:37Z

I would prefer to leave the version as-is so I can bump it in #229 this week and cut a new release after testing.

Can we still merge this one first and then you can rebase #229? I really don't want to rebase this one.

Yes, that's the plan.

mcdonnnj

I think this LGTM ✔ One small suggestion for your consideration.

README.md

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

mcdonnnj and others added 30 commits May 28, 2025 11:15

Add a configuration block for pre-commit.ci

4d88c8b

This adds a `ci` block to the pre-commit configurations to control the behavior of the pre-commit.ci GitHub app.

Add a configuration to automatically label pull requests

f891704

This includes updating the dependabot configuration, adding a new `label-prs.yml` GitHub Actions workflow, and adding a suitable configuration file for the actions/labeler action used by the aforementioned workflow.

Add a dependabot configuration for Docker Compose

50c0ad8

This should produce dependabot PRs for Docker images defined in the Docker composition in this project.

Merge pull request #212 from cisagov/improvement/use_tag_not_branch

dd78561

Use a version tag for `cisagov/setup-env-github-action`

Merge pull request #216 from cisagov/dependabot/github_actions/action…

c2a8218

…s/setup-python-6 Bump actions/setup-python from 5 to 6

Merge pull request #217 from cisagov/dependabot/github_actions/action…

4f7398e

…s/setup-go-6 Bump actions/setup-go from 5 to 6

Merge pull request #213 from cisagov/improvement/add_ci_config_to_pre…

4d30d44

…-commit_config Add a configuration block for pre-commit.ci

Merge pull request #215 from cisagov/improvement/add_pr_auto_labelling

deb2480

Add a configuration to automatically label pull requests

Merge pull request #218 from cisagov/improvement/adjust_dependabot_la…

ad43910

…bels Adjust the labels dependabot uses for GitHub Actions updates

Merge pull request #221 from cisagov/improvement/adjust_gnu_getopt_ch…

b45b24c

…eck_logic Adjust the logic used to check for GNU getopt in the `setup-env` script

Merge pull request #214 from cisagov/dependabot/github_actions/action…

a27070a

…s/checkout-5 Bump actions/checkout from 4 to 5

Update pre-commit hook versions

d070095

This is done automatically with the `pre-commit autoupdate` command.

Conform to new markdownlint rule

ee20b2a

A new rule, `MD059/descriptive-link-text`, was added in markdownlint's 0.38.0 release, which itself is used in v0.45.0 of markdownlint-cli. As such, we must update to conform to the new rule.

Bump version from 0.0.1-rc.1 to 1.0.0

5bde44c

Merge pull request #220 from cisagov/maintenance/update_pre-commit_hooks

37010e5

Update `pre-commit` hook versions

Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton

cb19850

Sync bandit versions used in pre-commit config

ca3226e

Update GitHub actions to versions used upstream

d946283

Add python configuration to labeler

f2a3280

Add test code to labeler configuration

a197a7a

Correct version file location in labeler configuration

0f35673

jsf9k and others added 2 commits October 7, 2025 10:08

Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton

68196a2

Merge pull request #252 from cisagov/lineage/skeleton

722507b

⚠️ CONFLICT! Lineage pull request for: skeleton

jsf9k unassigned dav3r and mcdonnnj Oct 17, 2025

jsf9k added this to CyHy System Oct 17, 2025

jsf9k moved this to In Progress in CyHy System Oct 17, 2025

jsf9k added 4 commits October 17, 2025 15:41

Merge remote-tracking branch 'skeleton-docker/develop' into lineage/s…

607079d

…keleton

Add new Dependabot ignore directive from upstream

32632a6

Make links more descriptive

bd9a10b

This gets rid of two errors from our markdownlint pre-commit linter.

Upgrade to Python 3.12.12

4ef6859

This is the version of Python currently offered by Alpine Linux 3.22, so this is a necessary change.

jsf9k force-pushed the lineage/skeleton branch 3 times, most recently from 4c1dc07 to 6d1ca8e Compare October 20, 2025 17:06

Add gcc, libffi-dev, and musl-dev as system package dependencies

6d1ca8e

These packages are necessary to build the cffi wheel for the 386 platform.

jsf9k marked this pull request as ready for review October 20, 2025 17:38

jsf9k requested review from dav3r, jsf9k and mcdonnnj as code owners October 20, 2025 17:38

jsf9k enabled auto-merge October 20, 2025 17:39

dav3r approved these changes Oct 20, 2025

View reviewed changes

mcdonnnj approved these changes Oct 22, 2025

View reviewed changes

README.md Outdated Show resolved Hide resolved

Make link text a bit more specific

fdaea8e

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k merged commit c9f1e22 into develop Oct 22, 2025
27 checks passed

jsf9k deleted the lineage/skeleton branch October 22, 2025 14:26

github-project-automation bot moved this from In Progress to Done in CyHy System Oct 22, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

cisagovbot commented Sep 24, 2025 •

edited by jsf9k

Loading

Uh oh!

jsf9k commented Oct 20, 2025 •

edited

Loading

Uh oh!

dav3r commented Oct 20, 2025

Uh oh!

mcdonnnj commented Oct 20, 2025

Uh oh!

jsf9k commented Oct 21, 2025

Uh oh!

mcdonnnj commented Oct 21, 2025

Uh oh!

mcdonnnj left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

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

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

Uh oh!

Conversation

cisagovbot commented Sep 24, 2025 • edited by jsf9k Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

Uh oh!

jsf9k commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dav3r commented Oct 20, 2025

Uh oh!

mcdonnnj commented Oct 20, 2025

Uh oh!

jsf9k commented Oct 21, 2025

Uh oh!

mcdonnnj commented Oct 21, 2025

Uh oh!

mcdonnnj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cisagovbot commented Sep 24, 2025 •

edited by jsf9k

Loading

jsf9k commented Oct 20, 2025 •

edited

Loading