mirror of
https://github.com/cisagov/log4j-affected-db.git
synced 2024-11-22 08:30:48 +00:00
Add shell script pre-commit hooks
Now that software updates are handled by a bash script that is stored in the repository these pre-commit hooks should be re-added to the pre-commit configuration. This also includes re-adding all of the scaffolding that installs the shfmt tool in the build.yml workflow.
This commit is contained in:
parent
bc0e017b62
commit
eef99899dc
2 changed files with 44 additions and 1 deletions
25
.github/workflows/build.yml
vendored
25
.github/workflows/build.yml
vendored
|
@ -15,23 +15,46 @@ jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
- id: setup-env
|
||||||
|
uses: cisagov/setup-env-github-action@develop
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- id: setup-python
|
- id: setup-python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
python-version: "3.10"
|
python-version: "3.10"
|
||||||
|
# We need the Go version and Go cache location for the actions/cache step,
|
||||||
|
# so the Go installation must happen before that.
|
||||||
|
- uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: '1.16'
|
||||||
|
- name: Store installed Go version
|
||||||
|
id: go-version
|
||||||
|
run: |
|
||||||
|
echo "::set-output name=version::"\
|
||||||
|
"$(go version | sed 's/^go version go\([0-9.]\+\) .*/\1/')"
|
||||||
|
- name: Lookup Go cache directory
|
||||||
|
id: go-cache
|
||||||
|
run: |
|
||||||
|
echo "::set-output name=dir::$(go env GOCACHE)"
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
env:
|
env:
|
||||||
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
|
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
|
||||||
py${{ steps.setup-python.outputs.python-version }}"
|
py${{ steps.setup-python.outputs.python-version }}-\
|
||||||
|
go${{ steps.go-version.outputs.version }}-"
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
${{ env.PIP_CACHE_DIR }}
|
${{ env.PIP_CACHE_DIR }}
|
||||||
${{ env.PRE_COMMIT_CACHE_DIR }}
|
${{ env.PRE_COMMIT_CACHE_DIR }}
|
||||||
|
${{ steps.go-cache.outputs.dir }}
|
||||||
key: "${{ env.BASE_CACHE_KEY }}\
|
key: "${{ env.BASE_CACHE_KEY }}\
|
||||||
${{ hashFiles('**/.pre-commit-config.yaml') }}"
|
${{ hashFiles('**/.pre-commit-config.yaml') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ env.BASE_CACHE_KEY }}
|
${{ env.BASE_CACHE_KEY }}
|
||||||
|
- name: Install shfmt
|
||||||
|
env:
|
||||||
|
PACKAGE_URL: mvdan.cc/sh/v3/cmd/shfmt
|
||||||
|
PACKAGE_VERSION: ${{ steps.setup-env.outputs.shfmt-version }}
|
||||||
|
run: go install ${PACKAGE_URL}@${PACKAGE_VERSION}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip setuptools wheel
|
python -m pip install --upgrade pip setuptools wheel
|
||||||
|
|
|
@ -46,3 +46,23 @@ repos:
|
||||||
- id: yamllint
|
- id: yamllint
|
||||||
args:
|
args:
|
||||||
- --strict
|
- --strict
|
||||||
|
|
||||||
|
# Shell script hooks
|
||||||
|
- repo: https://github.com/cisagov/pre-commit-shfmt
|
||||||
|
rev: v0.0.2
|
||||||
|
hooks:
|
||||||
|
- id: shfmt
|
||||||
|
args:
|
||||||
|
# Indent by two spaces
|
||||||
|
- -i
|
||||||
|
- '2'
|
||||||
|
# Binary operators may start a line
|
||||||
|
- -bn
|
||||||
|
# Switch cases are indented
|
||||||
|
- -ci
|
||||||
|
# Redirect operators are followed by a space
|
||||||
|
- -sr
|
||||||
|
- repo: https://github.com/detailyang/pre-commit-shell
|
||||||
|
rev: 1.0.5
|
||||||
|
hooks:
|
||||||
|
- id: shell-lint
|
||||||
|
|
Loading…
Reference in a new issue