Skip to content

Lineage pull request for: skeleton #85

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

Merged
merged 12 commits into from
Aug 26, 2021
Merged

Lineage pull request for: skeleton #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a0f2493
Fix a typo
dav3r Aug 4, 2021
f7140d8
Use the hashicorp/setup-terraform Action
mcdonnnj Aug 10, 2021
7f324b9
Add a markdownlint rule for horizontal rules
mcdonnnj Aug 10, 2021
9848ff6
Add a markdownlint rule for code blocks
mcdonnnj Aug 10, 2021
23f9cfd
Update pre-commit hooks
mcdonnnj Aug 10, 2021
5459c2c
Merge branch 'develop' into dav3r-patch-1
mcdonnnj Aug 18, 2021
929bab5
Merge pull request #85 from cisagov/dav3r-patch-1
mcdonnnj Aug 18, 2021
f632766
Merge branch 'develop' into improvement/specify_mdl_rules
mcdonnnj Aug 18, 2021
bd030a1
Merge pull request #89 from cisagov/improvement/specify_mdl_rules
mcdonnnj Aug 18, 2021
c9c6562
Merge branch 'develop' into improvement/use_setup-terraform_in_gha_wo…
mcdonnnj Aug 18, 2021
a4196ee
Merge pull request #88 from cisagov/improvement/use_setup-terraform_i…
mcdonnnj Aug 18, 2021
82a44a5
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,9 @@ jobs:
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
sudo ln -s /opt/packer/packer /usr/local/bin/packer
- name: Install Terraform
run: |
TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
curl --output ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
--time-cond ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \
--location \
"https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${TERRAFORM_ZIP}"
sudo unzip -d /opt/terraform \
${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}"
sudo mv /usr/local/bin/terraform /usr/local/bin/terraform-default
sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform
- uses: hashicorp/setup-terraform@v1
with:
terraform_version: ${{ env.TERRAFORM_VERSION }}
- name: Install shfmt
run: go install mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}
- name: Install Terraform-docs
Expand Down
10 changes: 10 additions & 0 deletions .mdl_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,13 @@ MD033:
allowed_elements:
- h1
- img

# MD035/hr-style - Horizontal rule style
MD035:
# Enforce dashes for horizontal rules
style: "---"

# MD046/code-block-style Code block style
MD046:
# Enforce the fenced style for code blocks
style: "fenced"
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repos:

# Text file hooks
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.27.1
rev: v0.28.1
hooks:
- id: markdownlint
args:
Expand All @@ -41,15 +41,15 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.1
rev: v1.26.2
hooks:
- id: yamllint
args:
- --strict

# pre-commit hooks
- repo: https://github.com/pre-commit/pre-commit
rev: v2.13.0
rev: v2.14.0
hooks:
- id: validate_manifest

Expand Down Expand Up @@ -101,7 +101,7 @@ repos:
additional_dependencies:
- flake8-docstrings
- repo: https://github.com/PyCQA/isort
rev: 5.9.2
rev: 5.9.3
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
Expand All @@ -111,7 +111,7 @@ repos:
additional_dependencies:
- types-setuptools
- repo: https://github.com/asottile/pyupgrade
rev: v2.21.2
rev: v2.23.3
hooks:
- id: pyupgrade

Expand Down
2 changes: 1 addition & 1 deletion setup-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o pipefail

USAGE=$(
cat << 'END_OF_LINE'
Configure a developement environment for this repository.
Configure a development environment for this repository.

It does the following:
- Verifies pyenv and pyenv-virtualenv are installed.
Expand Down