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

cisagovbot · 2023-09-13T01:39:39Z

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.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/skeleton-python-library.git skeleton-python-library
cd skeleton-python-library
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

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

✅ Post-merge checklist

Add the Run diagnostics check to the branch protection requirements for the develop branch.

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>

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

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

…nfiguration Update the Dependabot configuration

Delete duplicate word "are"

Add nixfmt pre-commit hook

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

Enable the new dependabot ignore directives that were added in cisagov/skeleton-generic.

This updates the remaining declarations to match what was pulled down from cisagov/skeleton-generic.

Ensure the `diagnostics` job is a dependency for the other jobs. This aligns with what was done to the `lint` job in cisagov/skeleton-generic.

This aligns with what was done to the `lint` job of the build.yml workflow that was inherited from cisagov/skeleton-generic.

This bumps the second bandit hook that is used in this project lineage. Since this hook does not exist in the configuration from cisagov/skeleton-generic we must update it here.

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

jsf9k

Approval intensifies!!!

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>

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

Merge pull request #139 from cisagov/improvement/use-correct-repo-name

8145a93

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

Merge pull request #140 from cisagov/improvement/update_dependabot_co…

ce74358

…nfiguration Update the Dependabot configuration

Merge pull request #141 from cisagov/documentation/grammar

338e3e1

Delete duplicate word "are"

Merge pull request #143 from cisagov/add-nixfmt

8432f1e

Add nixfmt pre-commit hook

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

8cdbc7b

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

mcdonnnj added the github-actions Pull requests that update GitHub Actions code label Sep 13, 2023

mcdonnnj added 2 commits September 13, 2023 15:06

Merge github.com:cisagov/skeleton-generic into lineage/skeleton

737aaff

Enable dependabot ignore directives

8a9d149

Enable the new dependabot ignore directives that were added in cisagov/skeleton-generic.

mcdonnnj force-pushed the lineage/skeleton branch from 273eb4e to 56c377c Compare September 13, 2023 19:13

mcdonnnj marked this pull request as ready for review September 13, 2023 19:23

mcdonnnj requested review from dav3r, felddy, jasonodoom, jsf9k and mcdonnnj as code owners September 13, 2023 19:23

jsf9k approved these changes Sep 13, 2023

View reviewed changes

mcdonnnj added 2 commits September 13, 2023 16:00

Bump actions/checkout from 3 to 4

7f3d844

This updates the remaining declarations to match what was pulled down from cisagov/skeleton-generic.

Update job dependencies for the build.yml workflow

465a5a5

Ensure the `diagnostics` job is a dependency for the other jobs. This aligns with what was done to the `lint` job in cisagov/skeleton-generic.

mcdonnnj force-pushed the lineage/skeleton branch from 56c377c to 70c1726 Compare September 13, 2023 20:00

mcdonnnj added 3 commits September 13, 2023 16:37

Add runner hardening to all jobs in our workflows

41cbf1e

This aligns with what was done to the `lint` job of the build.yml workflow that was inherited from cisagov/skeleton-generic.

Bump the bandit hook from 1.7.4 to 1.7.5

1290819

This bumps the second bandit hook that is used in this project lineage. Since this hook does not exist in the configuration from cisagov/skeleton-generic we must update it here.

Remove unnecessary quotes in the codeql-analysis.yml workflow

aca5662

We generally only use quotes when they are strictly necessary to ensure data is interpreted as a string value. This mirrors what was done to the configurations inherited from cisagov/skeleton-generic.

mcdonnnj force-pushed the lineage/skeleton branch from 70c1726 to aca5662 Compare September 13, 2023 20:38

jsf9k approved these changes Sep 14, 2023

View reviewed changes

dav3r approved these changes Sep 14, 2023

View reviewed changes

jsf9k mentioned this pull request Nov 9, 2023

Change tickets query to include newly-created tickets cisagov/cyhy-feeds#49

Merged

7 tasks

mcdonnnj added this pull request to the merge queue Dec 19, 2023

mcdonnnj added the kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release label Dec 19, 2023

mcdonnnj removed this pull request from the merge queue due to the queue being cleared Dec 19, 2023

mcdonnnj added this pull request to the merge queue Dec 19, 2023

mcdonnnj removed this pull request from the merge queue due to the queue being cleared Dec 19, 2023

mcdonnnj added this pull request to the merge queue Dec 19, 2023

Merged via the queue into develop with commit ab59592 Dec 19, 2023
54 checks passed

mcdonnnj deleted the lineage/skeleton branch December 19, 2023 22:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Sep 13, 2023 •

edited by mcdonnnj

jsf9k left a comment

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

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

Conversation

cisagovbot commented Sep 13, 2023 • edited by mcdonnnj

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

✅ Post-merge checklist

jsf9k left a comment

Choose a reason for hiding this comment

cisagovbot commented Sep 13, 2023 •

edited by mcdonnnj