Skip to content

Commit ad96d7c

Browse files
authored
Merge pull request #32 from cisagov/lineage/skeleton
Lineage pull request for: skeleton
2 parents 374c162 + 7b3c4f1 commit ad96d7c

4 files changed

Lines changed: 29 additions & 19 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,9 @@ jobs:
7979
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
8080
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
8181
sudo ln -s /opt/packer/packer /usr/local/bin/packer
82-
- name: Install Terraform
83-
run: |
84-
TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
85-
curl --output ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
86-
--time-cond ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
87-
--location \
88-
"https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${TERRAFORM_ZIP}"
89-
sudo unzip -d /opt/terraform \
90-
${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}"
91-
sudo mv /usr/local/bin/terraform /usr/local/bin/terraform-default
92-
sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform
82+
- uses: hashicorp/setup-terraform@v1
83+
with:
84+
terraform_version: ${{ env.TERRAFORM_VERSION }}
9385
- name: Install shfmt
9486
run: go install mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}
9587
- name: Install Terraform-docs
@@ -118,7 +110,11 @@ jobs:
118110
runs-on: ubuntu-latest
119111
strategy:
120112
matrix:
121-
python-version: [3.6, 3.7, 3.8, 3.9]
113+
python-version:
114+
- 3.6
115+
- 3.7
116+
- 3.8
117+
- 3.9
122118
steps:
123119
- uses: actions/checkout@v2
124120
- id: setup-python
@@ -199,7 +195,11 @@ jobs:
199195
needs: [lint, test]
200196
strategy:
201197
matrix:
202-
python-version: [3.6, 3.7, 3.8, 3.9]
198+
python-version:
199+
- 3.6
200+
- 3.7
201+
- 3.8
202+
- 3.9
203203
steps:
204204
- uses: actions/checkout@v2
205205
- id: setup-python

.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
@@ -31,7 +31,7 @@ repos:
3131

3232
# Text file hooks
3333
- repo: https://github.com/igorshubovych/markdownlint-cli
34-
rev: v0.27.1
34+
rev: v0.28.1
3535
hooks:
3636
- id: markdownlint
3737
args:
@@ -41,15 +41,15 @@ repos:
4141
hooks:
4242
- id: prettier
4343
- repo: https://github.com/adrienverge/yamllint
44-
rev: v1.26.1
44+
rev: v1.26.2
4545
hooks:
4646
- id: yamllint
4747
args:
4848
- --strict
4949

5050
# pre-commit hooks
5151
- repo: https://github.com/pre-commit/pre-commit
52-
rev: v2.13.0
52+
rev: v2.14.0
5353
hooks:
5454
- id: validate_manifest
5555

@@ -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-setuptools
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)