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

cisagovbot · 2023-07-14T19:25:44Z

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 [email protected]:cisagov/postfix-docker.git postfix-docker
cd postfix-docker
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

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] <[email protected]>

…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

Co-authored-by: Shane Frasier <[email protected]>

The golang/lint tool was archived on May 9th, 2021 and based on golang/go#38968 no future work is planned. Coupled with the fact that it is not available from brew we are removing this hook as local development may be hindered by trying to satisfy running this hook. Co-authored-by: Shane Frasier <[email protected]> Co-authored-by: dav3r <[email protected]>

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

Resolves cisagov/skeleton-generic#131.

The cache key used relies on the existence of a go.sum file. Since we have no expectation for Go source code, including that file, and since we already include the Go cache in our job caching, we can safely disable caching in the Action.

Bump the version of Go used in our GitHub Actions configuration to the latest stable Go release.

Lineage pull request for: skeleton

…keleton

The pytest-dockerc plug is unmaintained and there is now a dependency issues with PyYAML because of the release of Cython v3 (which is itself a build dependency for PyYAML). After some research this seemed like the most similar package in terms of functionality to the package we are replacing. Although it is not a pytest plugin it still provides similar access and uses the Docker composition defined in the repository.

Switch packages used to test the configuration

# Conflicts: # tests/conftest.py # tests/container_test.py

dav3r

👍 with one comment noted.

tests/container_test.py

jsf9k and others added 30 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

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

Add Go hooks to support go code for our projects

a0bc20b

Add Staticcheck

3628e5f

Fix indentation

668724f

Co-authored-by: Shane Frasier <[email protected]>

Fix indentation

3d422b8

Co-authored-by: Shane Frasier <[email protected]>

Fix indentation

5571f47

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

4fd9501

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

412101a

Co-authored-by: Shane Frasier <[email protected]>

Fix formatting

a346fb5

Co-authored-by: Shane Frasier <[email protected]>

Revert updated versions for existing hooks

c47038b

Fix formatting

eb52678

Remove extra hook ids

f8179f1

Replace hooks with repo based option when available

42820e2

Update pre-commit hook versions

b823111

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

Add apostrophe to Qapla

b770fc6

detecting virtualenv installation successfully

24a0008

Whitespace change to make shfmt linter happy

f01965a

Fix two broken links

43d588f

Resolves cisagov/skeleton-generic#131.

Disable caching for the setup-go Action

e098255

The cache key used relies on the existence of a go.sum file. Since we have no expectation for Go source code, including that file, and since we already include the Go cache in our job caching, we can safely disable caching in the Action.

Bump Go from 1.19 to 1.20

edf1338

Bump the version of Go used in our GitHub Actions configuration to the latest stable Go release.

jsf9k and others added 2 commits July 14, 2023 15:37

Merge branch 'develop' into lineage/skeleton

cf24b08

Merge pull request #166 from cisagov/lineage/skeleton

8c26a61

Lineage pull request for: skeleton

jsf9k unassigned felddy, dav3r and mcdonnnj Jul 17, 2023

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

748aa6b

…keleton

jsf9k force-pushed the lineage/skeleton branch from 0d3740c to 748aa6b Compare July 17, 2023 15:13

jsf9k marked this pull request as ready for review July 17, 2023 15:41

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners July 17, 2023 15:41

jsf9k requested review from jasonodoom and a team July 17, 2023 15:41

dav3r approved these changes Jul 17, 2023

View reviewed changes

jasonodoom approved these changes Jul 17, 2023

View reviewed changes

dv4harr10 approved these changes Jul 19, 2023

View reviewed changes

mcdonnnj and others added 4 commits July 20, 2023 01:49

Merge pull request #167 from cisagov/improvement/update_testing_method

a9d6c92

Switch packages used to test the configuration

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

44cdc25

# Conflicts: # tests/conftest.py # tests/container_test.py

Correctly merge in upstream testing changes

e82a339

jsf9k force-pushed the lineage/skeleton branch from 411f25a to e82a339 Compare July 28, 2023 15:33

jsf9k requested review from dv4harr10, dav3r and jasonodoom July 28, 2023 16:03

dv4harr10 approved these changes Jul 28, 2023

View reviewed changes

dav3r approved these changes Jul 28, 2023

View reviewed changes

tests/container_test.py Show resolved Hide resolved

jsf9k enabled auto-merge July 28, 2023 19:59

jsf9k merged commit 6b385cb into develop Jul 28, 2023
13 checks passed

jsf9k deleted the lineage/skeleton branch July 28, 2023 20:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jul 14, 2023 •

edited by jsf9k

Loading

dav3r left a comment

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

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

Conversation

cisagovbot commented Jul 14, 2023 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

dav3r left a comment

Choose a reason for hiding this comment

cisagovbot commented Jul 14, 2023 •

edited by jsf9k

Loading