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 #93

Merged
merged 21 commits into from
Oct 20, 2021
Merged

Lineage pull request for: skeleton #93

merged 21 commits into from
Oct 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 15 commits October 19, 2021 17:15
Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook
is intentionally held back due to issues with switching to v5.
This file is copied from cisagov/skeleton-ansible-role#85 and tweaked to pass
pre-commit. See here for for a list of the elements that can exist in this
file: https://ansible-lint.readthedocs.io/en/latest/configuring.html

Co-authored-by: Shane Frasier <[email protected]>
…re-commit_version

Update the `ansible-lint` Version in the pre-commit Configuration
This will configure `dependabot` to scan Terraform configurations if they exist
in a repository. If a repository stores a Terraform configuration in a sub-
directory this configuration will need to be modified or an additional
configuration must be added if there still exists a Terraform configuration in
the root directory.
…uration_for_terraform

Add `dependabot` Configuration for Terraform
Change from using an environment variable to the outputs of the
cisagov/setup-env-github-action instead.
We use a `PACKER_VERSION` environment variable for the "Install Packer" step
that is populated from the `setup-env` outputs to get around `yamllint` lint
length limits.
We change the "Install shfmt" step to use two local environment variables to
provide the package's URL and version to install. This allows us to work around
`yamllint` line length limits.
We change the "Install Terraform-docs" step to use two local environment
variables to provide the package's URL and version to install. This allows us
to work around `yamllint` line length limits.
This changes from using an environment variable to using a step output to store
the Go version that is installed. This mirrors changes made to the other
program versions and how they're stored.
Use Outputs of cisagov/setup-env-github-action to Control Installed Program Versions
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Oct 19, 2021
@jsf9k
Copy link
Member

jsf9k commented Oct 20, 2021

@mcdonnnj - I can take a look at these failures if you want.

The `lint` job now requires the Ansible roles required for this project
to be installed due to using the (new to us) v5 of `ansible-lint`
Update the dependabot configuration to index the two directories that have
Terraform code in our Packer projects.
Update the `test` job to use the outputs of the cisagov/setup-env-github-action
Action to mirror the changes made to the `lint` job.
Update the `build` job to use the outputs of the
cisagov/setup-env-github-action Action to mirror the changes made to the `lint`
job.
Update the `prerelease` workflow to use the outputs of the
cisagov/setup-env-github-action Action to mirror changes made to the `build`
workflow.
Update the `release` workflow to use the outputs of the
cisagov/setup-env-github-action Action to mirror changes made to the `build`
workflow.
@mcdonnnj
Copy link
Member

mcdonnnj commented Oct 20, 2021

@mcdonnnj - I can take a look at these failures if you want.

Ah, sorry. I figured I knew what was wrong when I initially looked at the PR earlier, so I ended up resolving it before I saw your comment. Let me know if you think there's a better/more preferable way.

@jsf9k
Copy link
Member

jsf9k commented Oct 20, 2021

Ah, sorry. I figured I knew what was wrong when I initially looked at the PR earlier, so I ended up resolving it before I saw your comment. Let me know if you think there's a better/more preferable way.

No worries. I wasn't sure what was wrong, so I was just offering to help if you were also on the high seas.

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.

Huzzah!

@mcdonnnj mcdonnnj merged commit 8de10d2 into develop Oct 20, 2021
@mcdonnnj mcdonnnj deleted the lineage/skeleton branch October 20, 2021 19:37
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.

5 participants