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

Merged
merged 60 commits into from
Dec 21, 2023
Merged

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Dec 19, 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-python-library.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 git@github.com:cisagov/pshtt.git pshtt
    cd pshtt
    git remote add skeleton https://github.com/cisagov/skeleton-python-library.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/dependabot.yml .github/workflows/build.yml .pre-commit-config.yaml setup.py 
    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.

✅ Post-merge checklist

Remove any of the following that do not apply.


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 and others added 30 commits July 10, 2023 12:52
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
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>
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.
…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
…s/checkout-4

Bump actions/checkout from 3 to 4
@jsf9k jsf9k added version bump This issue or pull request increments the version number python Pull requests that update Python code github-actions Pull requests that update GitHub Actions code security This issue or pull request addresses a security issue and removed version bump This issue or pull request increments the version number labels Dec 21, 2023
@jsf9k jsf9k added the version bump This issue or pull request increments the version number label Dec 21, 2023
This resolved an issue from the bandit linter.
@jsf9k jsf9k marked this pull request as ready for review December 21, 2023 16:04
@jsf9k jsf9k enabled auto-merge December 21, 2023 16:05
@jsf9k jsf9k merged commit 9a081e5 into develop Dec 21, 2023
42 checks passed
@jsf9k jsf9k deleted the lineage/skeleton branch December 21, 2023 18:27
jsf9k added a commit that referenced this pull request Dec 21, 2023
This should have been done as part of #251, but I neglected to do so.
Mea culpa.
@jsf9k jsf9k mentioned this pull request Dec 21, 2023
6 tasks
@jsf9k
Copy link
Member

jsf9k commented Dec 21, 2023

See also #253.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github-actions Pull requests that update GitHub Actions code python Pull requests that update Python code security This issue or pull request addresses a security issue 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