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

cisagovbot · 2023-12-06T08:22:09Z

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/pshtt_reporter.git pshtt_reporter
cd pshtt_reporter
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 .github/dependabot.yml 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

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

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

This is being done for testing purposes, and this commit can be reverted (or removed) once cisagov/setup-env-github-action#65 is merged.

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

The repo name we were using redirects to the correct place, but we may as well cut out the middle man.

@mcdonnnj

…orrect staticcheck package URL Co-Authored By: @mcdonnnj <mcdonnj@users.noreply.github.com>

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value.

Our standard practice for YAML files is to sort keys alphabetically.

Co-authored-by: David Harris <David.Harris@associates.cisa.dhs.gov>

The "stopped" parameter is no longer present now that we are using python-on-whales. Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>

The token is optionally used for the build and prerelease actions to override the default values used by the semver Python package.

Since the replacement and commit of version change information is almost identical across the different logic flows it makes sense to DRY out the code.

Only retrieve the existing version information if the input to the bump_version.sh script isn't immediately invalid (if the script does not get 1-2 arguments).

The team has come to the consensus that the `git push` should be at the discretion of the user. This both prevents needless GitHub Actions runs and ensures that the repository is updated when the user feels it is in an appropriate state. Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

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

…b-action" This reverts commit ddbf6f7. This can be done now that cisagov/setup-env-github-action#65 has been merged.

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

Add crazy-max/ghaction-github-labeler as a commented out dependency to ignore in the dependabot configuration file. This should be enabled in downstream projects to consolidate updating this Action to the cisagov/skeleton-generic repository.

Add go packages for pre-commit

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

…keleton

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

There is currently a potential incompatibility with the default behavior of the version of buildx being used. A default image generated is built with provenance, which is something we would like to have, but these default images can run on neither Google Cloud Run nor AWS Lambda. Please see docker/buildx#1533 for mroe information. Since we want to retain support for creating AWS Lambda images we add a commented out disabling of this functionality that can be enabled in a downstream repository if needed.

…s/github-script-7 Bump actions/github-script from 6 to 7

…/build-push-action-5 Bump docker/build-push-action from 4 to 5

jasonodoom and others added 30 commits July 10, 2023 12:52

Add steps to setup go packages for pre-commit

4cb9a4b

Update action/checkout to use same version

53f56b0

Set specific gocritic version

f261099

Update build workflow with package installtion

097b573

Group go tools together with comment

254282a

Update staticcheck id

ecf3299

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

Update tool names to match author stylization

1eaedf5

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

Update statcicheck stylization

fd04757

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

Temporarily use a different branch of cisagov/setup-env-github-action

ddbf6f7

This is being done for testing purposes, and this commit can be reverted (or removed) once cisagov/setup-env-github-action#65 is merged.

Move go packages install to separate section

a8af336

Update go-critic name

1675b12

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

Update staticcheck name

c6ab22e

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

Use the correct repo name for the ansible-lint pre-commit hook

29de034

The repo name we were using redirects to the correct place, but we may as well cut out the middle man.

Correct staticcheck reference to setup-env, sort alphabetically and c…

1e7cb4f

…orrect staticcheck package URL Co-Authored By: @mcdonnnj <mcdonnj@users.noreply.github.com>

Remove Go section coment

5f3bc13

Co-authored-by: Shane Frasier <jeremy.frasier@gwe.cisa.dhs.gov>

Remove unnecessary quotes in the dependabot configuration

d311825

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value.

Sort the keys in the Dependabot configuration

2294d49

Our standard practice for YAML files is to sort keys alphabetically.

Delete duplicate word "are"

e678502

Co-authored-by: David Harris <David.Harris@associates.cisa.dhs.gov>

Reference correct parameter name in comment

a518cfb

The "stopped" parameter is no longer present now that we are using python-on-whales. Co-authored-by: dav3r <david.redmin@gwe.cisa.dhs.gov>

Add the ability to specify a token in bump_version.sh

0db97d1

The token is optionally used for the build and prerelease actions to override the default values used by the semver Python package.

DRY out logic to update version information

f646a73

Since the replacement and commit of version change information is almost identical across the different logic flows it makes sense to DRY out the code.

Change when existing version information is retrieved

cf5c0d7

Only retrieve the existing version information if the input to the bump_version.sh script isn't immediately invalid (if the script does not get 1-2 arguments).

Fix gosec stylization

948ebde

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

Revert "Temporarily use a different branch of cisagov/setup-env-githu…

98d3d3f

…b-action" This reverts commit ddbf6f7. This can be done now that cisagov/setup-env-github-action#65 has been merged.

Add nixfmt pre-commit hook

82db36a

Bump crazy-max/ghaction-github-labeler from 4 to 5

b04654e

Update the dependabot ignore configuration

49ac8c5

Add crazy-max/ghaction-github-labeler as a commented out dependency to ignore in the dependabot configuration file. This should be enabled in downstream projects to consolidate updating this Action to the cisagov/skeleton-generic repository.

Merge pull request #138 from cisagov/add-go-packages

4ec50ab

Add go packages for pre-commit

cisagovbot assigned dav3r, jasonodoom, jsf9k and mcdonnnj Dec 6, 2023

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Dec 6, 2023

jsf9k unassigned jasonodoom, dav3r and mcdonnnj Dec 6, 2023

jsf9k added github-actions Pull requests that update GitHub Actions code security This issue or pull request addresses a security issue labels Dec 6, 2023

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

482bd5a

…keleton

jsf9k force-pushed the lineage/skeleton branch from 251ace0 to 482bd5a Compare December 6, 2023 16:26

dependabot bot and others added 2 commits December 6, 2023 16:27

jsf9k marked this pull request as ready for review December 6, 2023 19:08

jsf9k requested review from dav3r, felddy, jasonodoom, jsf9k and mcdonnnj as code owners December 6, 2023 19:08

jsf9k enabled auto-merge December 6, 2023 19:08

jsf9k requested a review from a team December 6, 2023 19:09

mcdonnnj and others added 3 commits December 7, 2023 08:43

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

6ff485e

…s/github-script-7 Bump actions/github-script from 6 to 7

Merge pull request #174 from cisagov/dependabot/github_actions/docker…

7e820ba

…/build-push-action-5 Bump docker/build-push-action from 4 to 5

Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

16fc15e

dv4harr10 approved these changes Dec 7, 2023

View reviewed changes

jasonodoom approved these changes Dec 12, 2023

View reviewed changes

jsf9k merged commit 2e5eba7 into develop Dec 12, 2023
17 checks passed

jsf9k deleted the lineage/skeleton branch December 12, 2023 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Dec 6, 2023 •

edited by jsf9k

Loading

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

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

Conversation

cisagovbot commented Dec 6, 2023 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

cisagovbot commented Dec 6, 2023 •

edited by jsf9k

Loading