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

cisagovbot · 2023-03-26T05:20:56Z

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/con-pca-tasks.git con-pca-tasks
cd con-pca-tasks
git remote add skeleton https://github.com/cisagov/skeleton-generic.git
git remote set-url --push skeleton no_push
git switch develop
git checkout -b 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/CODEOWNERS 
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

@jasonodoom

Add @jasonodoom as a default codeowner

This is the latest minor release of Python so it makes sense to use it as the default for this job.

…n_for_lint_job Use Python 3.11 for the `lint` job in the `build` workflow

This is done automatically with the `pre-commit autoupdate` command. However the `ansible-lint` hook is manually kept back as we have not tested functionality to confirm that our roles will generally pass with the new version.

Update `pre-commit` hooks

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

…s/setup-go-4 Bump actions/setup-go from 3 to 4

When wheel gets installed alongside other packages, it may not get used when those other packages are installed. When that happens I see warnings like this: DEPRECATION: ansible-core is being installed using the legacy 'setup.py install' method, because it does not have a 'pyproject.toml' and the 'wheel' package is not installed. pip 23.1 will enforce this behaviour change. A possible replacement is to enable the '--use-pep517' option. Discussion can be found at pypa/pip#8559 This change should get rid of these warnings. Nota bene: This is the practice we follow in the Dockerfile in cisagov/skeleton-docker, but for some reason we never started using it in our workflows.

…nd-wheel-with-pip Install/upgrade setuptools and wheel when upgrading pip

…skeleton

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

…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

Update the version of the `crazy-max/ghaction-github-labeler` Action and add a dependabot ignore directive

# Conflicts: # .github/dependabot.yml

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

This mirror was created to leverage performance optimizations from mypyc wheels that are available if black is installed from PyPI. These wheels are not available if black is installed from source as it would be using the old URL. Please see psf/black#3828 and psf/black#3405 for more information.

This action is added in a separate "diagnostics" job. As configured it will never fail, but it will print out the status of the various GitHub components. This information will sometimes be useful when determining why builds fail after the fact. Co-authored-by: Mark Feldhousen <mark.feldhousen@gwe.cisa.dhs.gov> Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Even though the diagnostics job is not currently configured to fail due to the GitHub status, it is still true that if the job is unable to run that does not bode well for the lint job's successful execution. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

This can be useful when debugging why a GH Action failed. Co-authored-by: felddy <mark.feldhousen@gwe.cisa.dhs.gov>

This GH Action is being configured to run in audit mode. It should warn us if an Action is reaching out to an unexpected web address, overwriting source code, etc. Co-authored-by: felddy <mark.feldhousen@gwe.cisa.dhs.gov>

This task can only provide coverage for the job that contains it.

We need a reminder add the step-security/harden-runner action at the top of every job. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Update `pre-commit` hooks

Change the source repository for the `black` hook

Add a job that runs diagnostics

jsf9k

The latest Lineage changes are not merged in correctly.

dav3r · 2023-09-15T15:25:41Z

The latest Lineage changes are not merged in correctly.

I think this repo and related repos are heading for archival, so I wouldn't spend any time worrying about this.

jsf9k and others added 2 commits March 24, 2023 11:06

Add @jasonodoom as a default codeowner

744f07e

Merge pull request #128 from cisagov/add-odoom-to-default-codeowners

3eed760

Add @jasonodoom as a default codeowner

cisagovbot assigned itsmostafa and izzy64 Mar 26, 2023

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

mcdonnnj and others added 9 commits April 19, 2023 11:56

Use Python 3.11 for the lint job in the build workflow

8d39c8b

This is the latest minor release of Python so it makes sense to use it as the default for this job.

Merge pull request #130 from cisagov/improvement/update_python_versio…

5f4b768

…n_for_lint_job Use Python 3.11 for the `lint` job in the `build` workflow

Update pre-commit hook versions

db5e7ff

This is done automatically with the `pre-commit autoupdate` command. However the `ansible-lint` hook is manually kept back as we have not tested functionality to confirm that our roles will generally pass with the new version.

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

c9028cf

Update `pre-commit` hooks

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

847cd13

…s/setup-go-4 Bump actions/setup-go from 3 to 4

Merge pull request #126 from cisagov/improvement/install-setuptools-a…

7250368

…nd-wheel-with-pip Install/upgrade setuptools and wheel when upgrading pip

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

a688944

…skeleton

jsf9k force-pushed the lineage/skeleton branch from b23c36f to a688944 Compare April 27, 2023 18:53

jsf9k approved these changes Apr 27, 2023

View reviewed changes

jsf9k marked this pull request as ready for review April 27, 2023 20:29

jsf9k requested review from dav3r, felddy, mcdonnnj, itsmostafa and izzy64 as code owners April 27, 2023 20:29

dav3r approved these changes Apr 28, 2023

View reviewed changes

jasonodoom and others added 7 commits May 5, 2023 14:00

Add Go hooks to support go code for our projects

a0bc20b

Add Staticcheck

3628e5f

Fix indentation

668724f

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

Fix indentation

3d422b8

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

Fix indentation

5571f47

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

Fix formatting

4fd9501

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

Fix formatting

412101a

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

jsf9k and others added 26 commits August 22, 2023 10:19

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

Merge pull request #146 from cisagov/improvement/update_labeler_action

ca49bea

Update the version of the `crazy-max/ghaction-github-labeler` Action and add a dependabot ignore directive

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

e3a05de

# Conflicts: # .github/dependabot.yml

Update pre-commit hook versions

94d753d

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

Add a GH Action to dump the context

f437066

This can be useful when debugging why a GH Action failed. Co-authored-by: felddy <mark.feldhousen@gwe.cisa.dhs.gov>

Give the diagnostics job a descriptive name

c5e56a2

Add the step-security/harden-runner GH Action

9afb516

This GH Action is being configured to run in audit mode. It should warn us if an Action is reaching out to an unexpected web address, overwriting source code, etc. Co-authored-by: felddy <mark.feldhousen@gwe.cisa.dhs.gov>

Add a harden-runner task to the lint job as well

9dc773c

This task can only provide coverage for the job that contains it.

Add a reminder

bb81ec3

We need a reminder add the step-security/harden-runner action at the top of every job. Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

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

94903ae

Update `pre-commit` hooks

Merge pull request #148 from cisagov/improvement/change_black_repository

8d8577c

Change the source repository for the `black` hook

Merge pull request #144 from cisagov/improvement/add-github-status-jazz

c0eed09

Add a job that runs diagnostics

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

2a4d3d3

jsf9k requested review from jsf9k and dav3r September 13, 2023 17:49

jsf9k suggested changes Sep 13, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Mar 26, 2023 •

edited by jsf9k

Loading

jsf9k left a comment

dav3r commented Sep 15, 2023

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

Are you sure you want to change the base?

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

Conversation

cisagovbot commented Mar 26, 2023 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

jsf9k left a comment

Choose a reason for hiding this comment

dav3r commented Sep 15, 2023

cisagovbot commented Mar 26, 2023 •

edited by jsf9k

Loading