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 Updates #40

Merged
merged 7 commits into from
Apr 7, 2020
Merged

Pull in Upstream Updates #40

merged 7 commits into from
Apr 7, 2020

Conversation

mcdonnnj
Copy link
Member

@mcdonnnj mcdonnnj commented Apr 7, 2020

🗣 Description

This PR is to pull in changes from cisagov/skeleton-generic#41.

💭 Motivation and Context

Updates and bugfixes are good.

🧪 Testing

Automated testing passed.

📷 Screenshots (if appropriate)

🚥 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 added 6 commits April 6, 2020 12:05
@mcdonnnj
Ran pre-commit autoupdate to get the latest version of the
0bc1aab 
`pre-commit-terraform` hook since the PR I submitted,
antonbabenko/pre-commit-terraform#100,
was approved. This will fix issues with `skeleton-tf-module` related to multiple
directories with Terraform code.
@mcdonnnj
Explicitly install pre-commit hooks as its own step so it's clearer w…
b01a0ee 
…hen the

failure is with setup rather than hooks running.
@mcdonnnj
Rename action to accurately reflect that we are only linting, not bui…
1f3d440 
…lding.

Adjust description for pre-commit hook setup to better convey what is being
done.
@mcdonnnj
Sort .gitignore entries.
647b351
@mcdonnnj
Merge pull request #41 from cisagov/bugfix/update_pre-commit_for_pre-…
89b098a 
…commit-terraform_hook

Update pre-commit Hooks to Include Bugfix
@mcdonnnj
Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…
14e3362 
…provements/pull_upstream_updates
@mcdonnnj mcdonnnj requested a review from hillaryj April 7, 2020 17:53
@mcdonnnj mcdonnnj requested review from dav3r, felddy, jsf9k and a team as code owners April 7, 2020 17:53
@mcdonnnj mcdonnnj self-assigned this Apr 7, 2020
jsf9k
jsf9k approved these changes Apr 7, 2020
View reviewed changes
Copy link
Member

@jsf9k jsf9k left a comment

Choose a reason for hiding this comment

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

Snap into a Slim Jim!

dav3r
dav3r approved these changes Apr 7, 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.

💀 🐍 ⚙️ 👍

@mcdonnnj mcdonnnj merged commit f65532f into develop Apr 7, 2020
@mcdonnnj mcdonnnj deleted the improvements/pull_upstream_updates branch April 7, 2020 18:12
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

@jsf9k jsf9k jsf9k approved these changes

@hillaryj hillaryj Awaiting requested review from hillaryj

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

Assignees

@mcdonnnj mcdonnnj

Labels
None yet
Projects
Skeleton Maintenance
Status: Done
Milestone
No milestone
Development

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