Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 68 commits into from
Jul 31, 2023
Merged

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Jul 14, 2023

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

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

  2. Clone the repository locally, and reapply the merge:

    git clone [email protected]: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
  3. Review the changes displayed by the status command. Fix any conflicts and
    possibly incorrect auto-merges.

  4. After resolving each of the conflicts, add your changes to the
    branch, commit, and push your changes:

    git add .github/CODEOWNERS 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.

  5. Wait for all the automated tests to pass.

  6. Confirm each item in the "Pre-approval checklist" below.

  7. Remove any of the checklist items that do not apply.

  8. Ensure every remaining checkbox has been checked.

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

✅ Pre-merge checklist

Remove any of the following that do not apply. These boxes should
remain unchecked until the pull request has been approved.

  • Bump major, minor, patch, or pre-release version as appropriate via the bump_version.sh script if this repository is versioned and the changes in this PR warrant a version bump.
  • Finalize version.

✅ Post-merge checklist

Remove any of the following that do not apply.

  • Create a release.

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

jsf9k and others added 30 commits March 24, 2023 11:06
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.
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]>
Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
Co-authored-by: Shane Frasier <[email protected]>
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.
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.
mcdonnnj and others added 2 commits July 20, 2023 01:49
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
@jsf9k jsf9k assigned jsf9k and unassigned mcdonnnj Jul 31, 2023
@jsf9k jsf9k added the test This issue or pull request adds or otherwise modifies test code label Jul 31, 2023
@jsf9k jsf9k force-pushed the lineage/skeleton branch 2 times, most recently from 0f9b565 to b8d6a93 Compare July 31, 2023 15:14
The previously specified versions of these packages no longer exist.
@jsf9k jsf9k added version bump This issue or pull request increments the version number dependencies Pull requests that update a dependency file docker Pull requests that update Docker code labels Jul 31, 2023
@jsf9k jsf9k marked this pull request as ready for review July 31, 2023 17:31
@jsf9k jsf9k requested review from jasonodoom and a team July 31, 2023 17:31
@jsf9k jsf9k merged commit 0e799b5 into develop Jul 31, 2023
13 checks passed
@jsf9k jsf9k deleted the lineage/skeleton branch July 31, 2023 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file docker Pull requests that update Docker code test This issue or pull request adds or otherwise modifies test code upstream update This issue or pull request pulls in upstream updates version bump This issue or pull request increments the version number
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants