Skip to content

Commit 1158454

Browse files
authored
Merge pull request #19 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents df66256 + 3cdbd67 commit 1158454

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,9 @@ jobs:
9898
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
9999
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
100100
sudo ln -s /opt/packer/packer /usr/local/bin/packer
101-
- name: Install Terraform
102-
run: |
103-
TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
104-
curl --output ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
105-
--time-cond ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
106-
--location \
107-
"https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${TERRAFORM_ZIP}"
108-
sudo unzip -d /opt/terraform \
109-
${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}"
110-
sudo mv /usr/local/bin/terraform /usr/local/bin/terraform-default
111-
sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform
101+
- uses: hashicorp/setup-terraform@v1
102+
with:
103+
terraform_version: ${{ env.TERRAFORM_VERSION }}
112104
- name: Install shfmt
113105
run: go install mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}
114106
- name: Install Terraform-docs

.mdl_config.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,13 @@ MD033:
3838
allowed_elements:
3939
- h1
4040
- img
41+
42+
# MD035/hr-style - Horizontal rule style
43+
MD035:
44+
# Enforce dashes for horizontal rules
45+
style: "---"
46+
47+
# MD046/code-block-style Code block style
48+
MD046:
49+
# Enforce the fenced style for code blocks
50+
style: "fenced"

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repos:
3232

3333
# Text file hooks
3434
- repo: https://github.com/igorshubovych/markdownlint-cli
35-
rev: v0.27.1
35+
rev: v0.28.1
3636
hooks:
3737
- id: markdownlint
3838
args:
@@ -42,15 +42,15 @@ repos:
4242
hooks:
4343
- id: prettier
4444
- repo: https://github.com/adrienverge/yamllint
45-
rev: v1.26.1
45+
rev: v1.26.2
4646
hooks:
4747
- id: yamllint
4848
args:
4949
- --strict
5050

5151
# pre-commit hooks
5252
- repo: https://github.com/pre-commit/pre-commit
53-
rev: v2.13.0
53+
rev: v2.14.0
5454
hooks:
5555
- id: validate_manifest
5656

@@ -101,7 +101,7 @@ repos:
101101
additional_dependencies:
102102
- flake8-docstrings
103103
- repo: https://github.com/PyCQA/isort
104-
rev: 5.9.2
104+
rev: 5.9.3
105105
hooks:
106106
- id: isort
107107
- repo: https://github.com/pre-commit/mirrors-mypy
@@ -111,7 +111,7 @@ repos:
111111
additional_dependencies:
112112
- types-requests
113113
- repo: https://github.com/asottile/pyupgrade
114-
rev: v2.21.2
114+
rev: v2.23.3
115115
hooks:
116116
- id: pyupgrade
117117

setup-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o pipefail
66

77
USAGE=$(
88
cat << 'END_OF_LINE'
9-
Configure a developement environment for this repository.
9+
Configure a development environment for this repository.
1010
1111
It does the following:
1212
- Verifies pyenv and pyenv-virtualenv are installed.

0 commit comments

Comments
 (0)