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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 16 commits into from
Jan 7, 2021
Merged

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

merged 16 commits into from
Jan 7, 2021

Conversation

cisagovbot
Copy link

@cisagovbot cisagovbot commented Jan 7, 2021 •
edited by mcdonnnj
Loading

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

  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/skeleton-docker.git skeleton-docker
cd skeleton-docker
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

  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 .pre-commit-config.yaml 
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. Check the "Everything is cool" checkbox below:

    • ✌️ The conflicts in this pull request have been resolved.

  7. Mark this draft pull request "Ready for review".

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

@mcdonnnj
Update prettier hook details
b769825 
Per prettier/prettier#8937 the pre-commit hook has
been moved to https://github.com/pre-commit/mirrors-prettier. I have also
updated to the latest version in that repository.
@mcdonnnj
Update black hook repo url
2d6bf50 
At some point the python GitHub organization renamed to psf (Python Software
Foundation). Although it redirects with no issue, I think it should be updated
to reflect the current repository URL.
@mcdonnnj
Remove trailing '.git's from repository URLs
5115bae 
Two hooks had trailing '.git's in the URLs. Although this is not a problem, we
should be consistent in how we format things.
@mcdonnnj
Enable two additional hooks from default pre-commit-hooks
a7f86dd 
Enabled 'check-case-conflict' because of our mixed Linux and macOS development.
Although APFS supports case-sensitive containers, it is not the default as far
as I am aware. Linux filesystems are typically case-sensitive however.

With the merge of cisagov/development-guide#42 we now
have a TOML file in a repository, so it does not hurt to add this hook in case
more are added in the future.
@mcdonnnj
Run pre-commit autoupdate
06159cb
@mcdonnnj
Update repo URL for the isort hook
d836e91 
I missed that this repository was transfered from the creator, Timothy Crosley,
to the PyCQA organization.
@mcdonnnj
Update ansible-lint hook URL
46ec3e7
@mcdonnnj
Run pre-commit autoupdate
362b054
@mcdonnnj
Add the pre-commit-packer repo and hooks
8f7435a
@mcdonnnj
Add the --strict flag to the yamllint pre-commot hook
2fb4e15 
The --strict flag will cause the yamllint hook to exit with a non-zero exit
code when warnings are found instead of only when errors are found.
@mcdonnnj
Merge pull request #63 from cisagov/pre-commit_hook_maintenance
01e3f84 
pre-commit Hook Maintenance and Update
@mcdonnnj
Merge branch 'develop' into improvement/add_pre-commit-packer
be43230
@mcdonnnj
Merge pull request #64 from cisagov/improvement/add_pre-commit-packer
2383819 
Add the pre-commit-packer Repo and Hooks to the pre-commit Configuration
@mcdonnnj
Merge branch 'develop' into improvement/enable_yamllint_strict
9d909da
@mcdonnnj
Merge pull request #65 from cisagov/improvement/enable_yamllint_strict
09f4f54 
Use the --strict Flag for the yamllint pre-commit Hook
@mcdonnnj mcdonnnj marked this pull request as ready for review January 7, 2021 17:39
hillaryj
hillaryj approved these changes Jan 7, 2021
View reviewed changes
Copy link
Contributor

@hillaryj hillaryj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐙

dav3r
dav3r approved these changes Jan 7, 2021
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

felddy
felddy approved these changes Jan 7, 2021
View reviewed changes
Copy link
Member

@felddy felddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⭐

@mcdonnnj mcdonnnj merged commit f3f257e into develop Jan 7, 2021
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch January 7, 2021 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dav3r dav3r dav3r approved these changes

@hillaryj hillaryj hillaryj approved these changes

@felddy felddy felddy approved these changes

@jsf9k jsf9k Awaiting requested review from jsf9k jsf9k is a code owner

@mcdonnnj mcdonnnj Awaiting requested review from mcdonnnj mcdonnnj is a code owner

Assignees

@mcdonnnj mcdonnnj

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cisagovbot @felddy @hillaryj @dav3r @jsf9k @mcdonnnj