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.

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

Lineage pull request for: skeleton #15

Merged
merged 29 commits into from
Jul 20, 2021
Merged

Lineage pull request for: skeleton #15

merged 29 commits into from
Jul 20, 2021

Conversation

cisagovbot
Copy link

Lineage Pull Request

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.


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 and others added 28 commits June 18, 2021 03:33
Add rules to enforce ATX-closed headers, dashes for unordered list elements,
and `1.` for ordered list elements.
Add <h1> and <img> tags to the allowed list for MD033 (HTML elements) to
support using an image as the first thing in a markdown file (header image).
This converts the existing `.mdl_config.json` file to an equivalent
`.mdl_config.yaml` file. The reference in the markdownlint pre-commit hook
configuration is updated to match.

Co-authored-by: Shane Frasier <[email protected]>
Now that this is a YAML file we can add comments explaining the rule
modifications we use. This will make it easier to edit or expand in the future.
This hook will validate any pre-commit hook manifest files in the repository.
We should be doing this because the Packer and Terraform pre-commit
hooks leverage the corresponding executables; therefore, it makes
sense to go ahead and install the particular versions of those
executables that we support.  Also add support for optionally
debugging via tmate.

See also cisagov/skeleton-generic#74.
There is no reason to create /usr/bin/terraform.  This is a vestige of
an earlier age.

Co-authored-by: Nick M. <[email protected]>
The Terraform installation does not destroy the existing system
Terraform installation, and neither should the Packer installation.

Co-authored-by: Nick M. <[email protected]>
Note that this change is dependent on the merging of
cisagov/setup-env-github-action#31.

Co-authored-by: Nick M. <[email protected]>
Some variables defined in the go installation are used in the cache
task, so the go installation must happen first.

Co-authored-by: Nick M. <[email protected]>
As of [Go 1.16](https://tip.golang.org/doc/go1.16#go-command) the `GO111MODULE` environment variable defaults to `on` and `go get` has been deprecated for module installation.

Co-authored-by: Nick M. <[email protected]>
The `shfmt` tool does not ship on the GitHub Actions runners so we must install
it manually.
We have had a difficult time with how beautysh parses some shellscripts. I went
in pursuit of an alternative and I believe shfmt to be a good alternative.

Co-authored-by: Shane Frasier <[email protected]>
This is performed by running `pre-commit autoupdate`, but with the
`ansible-lint` hook held back manually.
Add the validate_manifest Hook to pre-commit Configuration
…-for-linting

Install terraform and packer for the linting job
…_shfmt

Replace beautysh hook with cisagov/pre-commit-shfmt
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jul 19, 2021
@jsf9k jsf9k assigned mcdonnnj and unassigned mcdonnnj Jul 19, 2021
@jsf9k jsf9k removed their assignment Jul 19, 2021
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.

👍

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.

LGTM ✔

@mcdonnnj mcdonnnj merged commit a78a2c1 into develop Jul 20, 2021
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch July 20, 2021 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream update This issue or pull request pulls in upstream updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants