-
Notifications
You must be signed in to change notification settings - Fork 81
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Delete duplicate word "are"
Add nixfmt pre-commit hook
…s/checkout-4 Bump actions/checkout from 3 to 4
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
force-pushed
the
lineage/skeleton
branch
from
December 21, 2023 15:30
7b75227
to
3acfc31
Compare
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
force-pushed
the
lineage/skeleton
branch
from
December 21, 2023 15:59
98e78f1
to
5539d2d
Compare
jsf9k
requested review from
dav3r,
felddy,
jasonodoom,
jsf9k,
mcdonnnj and
IanLee1521
as code owners
December 21, 2023 16:05
jasonodoom
approved these changes
Dec 21, 2023
dav3r
approved these changes
Dec 21, 2023
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.
6 tasks
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 conflictsthat 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:
Review the changes displayed by the
status
command. Fix any conflicts andpossibly incorrect auto-merges.
After resolving each of the conflicts,
add
your changes to thebranch,
commit
, andpush
your changes: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!
✅ 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_version.sh
script if this repository is versioned and the changes in this PR warrant a version bump. (See Bump version from v0.7.0 to v0.7.1 #253.)✅ 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