Browse Source

Use alternate self-sufficient shellcheck precommit

This pre-commit does not require prerequisite on the host, making it
easier to run in CI workflows.
pull/11244/head
Max Gautier 6 months ago
parent
commit
21aba10e08
Failed to extract signature
3 changed files with 3 additions and 20 deletions
  1. 1
      .gitlab-ci.yml
  2. 16
      .gitlab-ci/shellcheck.yml
  3. 6
      .pre-commit-config.yaml

1
.gitlab-ci.yml

@ -77,7 +77,6 @@ ci-authorized:
include: include:
- .gitlab-ci/build.yml - .gitlab-ci/build.yml
- .gitlab-ci/lint.yml - .gitlab-ci/lint.yml
- .gitlab-ci/shellcheck.yml
- .gitlab-ci/terraform.yml - .gitlab-ci/terraform.yml
- .gitlab-ci/packet.yml - .gitlab-ci/packet.yml
- .gitlab-ci/vagrant.yml - .gitlab-ci/vagrant.yml

16
.gitlab-ci/shellcheck.yml

@ -1,16 +0,0 @@
---
shellcheck:
extends: .job
stage: unit-tests
tags: [light]
variables:
SHELLCHECK_VERSION: v0.7.1
before_script:
- ./tests/scripts/rebase.sh
- curl --silent --location "https://github.com/koalaman/shellcheck/releases/download/"${SHELLCHECK_VERSION}"/shellcheck-"${SHELLCHECK_VERSION}".linux.x86_64.tar.xz" | tar -xJv
- cp shellcheck-"${SHELLCHECK_VERSION}"/shellcheck /usr/bin/
- shellcheck --version
script:
# Run shellcheck for all *.sh
- find . -name '*.sh' -not -path './.git/*' | xargs shellcheck --severity error
except: ['triggers', 'master']

6
.pre-commit-config.yaml

@ -27,11 +27,11 @@ repos:
args: [-r, "~MD013,~MD029"] args: [-r, "~MD013,~MD029"]
exclude: "^.git" exclude: "^.git"
- repo: https://github.com/jumanjihouse/pre-commit-hooks
rev: 3.0.0
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.10.0.1
hooks: hooks:
- id: shellcheck - id: shellcheck
args: [--severity, "error"]
args: ["--severity=error"]
exclude: "^.git" exclude: "^.git"
files: "\\.sh$" files: "\\.sh$"

Loading…
Cancel
Save