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

Pull in upstream changes #16

Merged
merged 7 commits into from
Jan 27, 2020
Merged

Pull in upstream changes #16

merged 7 commits into from
Jan 27, 2020

Conversation

jsf9k
Copy link
Member

@jsf9k jsf9k commented Jan 27, 2020

🗣 Description

Pull in upstream changes from cisagov/skeleton-generic.

💭 Motivation and Context

The upstream changes fix an issue where GitHub Action workflows were not being run on pull requests generated from forks.

🧪 Testing

I verified that all pre-commit hooks pass.

🚥 Types of Changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (causes existing functionality to change)

✅ Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

mcdonnnj and others added 6 commits December 19, 2019 15:32
@mcdonnnj
Add seed-isort-config and isort to pre-commit hooks.
18b5d12 
Add isort configuration file.
@mcdonnnj
Merge pull request #28 from cisagov/improvements/pre-commit_add_isort
09afdf3 
Add isort tool to pre-commit hooks.
@jsf9k
Make workflow run when a PR is opened, synchronized, or reopened
2fa4cbe 
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
@jsf9k
Improve list formatting
dbd589d
@jsf9k
Merge pull request #29 from cisagov/improvement/better-handle-prs-fro…
a8e35d0 
…m-forked-repos

Make workflow run when a PR is opened, synchronized, or reopened
@jsf9k
Merge remote-tracking branch 'skeleton-generic/develop' into improvem…
e8fbc12 
…ent/upstream-changes
@jsf9k jsf9k requested review from felddy, dav3r, mcdonnnj and a team January 27, 2020 15:56
@jsf9k jsf9k self-assigned this Jan 27, 2020
mcdonnnj
mcdonnnj approved these changes Jan 27, 2020
View reviewed changes
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

🚀✔

@jsf9k jsf9k added the bug This issue or pull request addresses broken functionality label Jan 27, 2020
dav3r
dav3r approved these changes Jan 27, 2020
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.

Looking good 🐇

@jsf9k jsf9k merged commit 67ba599 into develop Jan 27, 2020
@jsf9k jsf9k deleted the improvement/upstream-changes branch January 27, 2020 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@dav3r dav3r dav3r approved these changes

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

Assignees

@jsf9k jsf9k

Labels
bug This issue or pull request addresses broken functionality
Projects
Skeleton Maintenance
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jsf9k @dav3r @mcdonnnj