⚠️ CONFLICT! Lineage pull request for: skeleton #9
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
…thon Set a default language for pre-commit hooks
…provement/upstream
Improvement/upstream
Add codeowners file with team OIS maintainers.
…provement/codeowners
Improvement/codeowners
Add isort configuration file.
Add isort tool to pre-commit hooks.
A user forked cisagov/scan-target-data and created a pull request, but the required GitHub Action(s) did not run. This is presumably because the user does not have Actions enabled in his or her fork. Ideally, the required Action(s) would run in cisagov/scan-target-data when a PR to merge changes back is created. Based on my reading of this link, adding the "pull_request" event type should make this happen: https://help.github.com/en/actions/automating-your-workflow-with-github-actions/events-that-trigger-workflows#pull-request-events-for-forked-repositories
…m-forked-repos Make workflow run when a PR is opened, synchronized, or reopened
…ent/upstream-changes
Pull in upstream changes
Cleanup Linux instructions and add WSL references to CONTRIBUTING.md
Update actions/checkout to v2 Update formatting to match downstream children
…n_and_checkout_action Update Python and actions/checkout Versions
Update pre-commit hooks (and flip Actions cache order in workflow).
…provements/pull_in_upstream_updates
… verbose '--requirement'.
…ches Use Verbose pip Switches
…provements/pull_in_upstream_updates
We have seen a number of issues related to this hook ever since it was re-enabled. It will need to remain disabled until at least the 0.13 Terraform release, and can only be re-enabled if all issues we have seen have been resolved in how `terraform validate` operates.
…bled. Review noticed that there lacked a determination for what we were doing about the problem with the terraform_validate hook. I described the problems but failed to mention what our path forward would be. This commit rectifies that oversight.
…om:cisagov/skeleton-generic into improvements/pre-commit_autoupdate_2020-05
# Conflicts: # .github/lineage.yml # CONTRIBUTING.md # tests/conftest.py # tests/container_test.py
…e_2020-05 Update pre-commit Hook Versions
jsf9k
requested changes
May 14, 2020
Lineage pull request for: skeleton
jsf9k
approved these changes
May 14, 2020
dav3r
reviewed
May 14, 2020
There was a problem hiding this comment.
@felddy - Before we merge this thang, we should pull in the late-breaking changes from cisagov/skeleton-docker#24.
| # Note build arguments here are for builds using docker-compose (pytest) | ||
| # The CI build workflow uses docker and passes the value from bump_version | ||
| args: | ||
| - VERSION=0.0.5 |
There was a problem hiding this comment.
Do we want to modify bump_version.sh so that this version number is also updated?
There was a problem hiding this comment.
Very nice! Is this something that we should push up to skeleton-docker?
Lineage will append to the PR. |
|
Boom! 💥 |
Yeah boi! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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-docker.gitCheck the changes in this pull request to ensure they won't cause issues with
your project.
The
lineage/skeletonbranch has one or more unresolved merge conflictsthat you must resolve before merging this pull request!
How to resolve the conflicts
Clone the
lineage/skeletonbranch locally:git clone --single-branch --branch lineage/skeleton [email protected]:cisagov/gophish-docker.gitReview each of the following files looking for conflict-resolution markers:
Resolve each of the conflicts and
addyour changes to the branch:git add CONTRIBUTING.md tests/conftest.py tests/container_test.pyOnce all the changes have been added,
commitandpushthe changes back toGitHub:
Wait for all the automated tests to pass.
Check the "Everything is cool" checkbox below:
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