summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-01-03 19:02:44 -0500
committerBen Gamari <ben@well-typed.com>2021-02-21 09:14:23 -0500
commit5bdbfb0b47e789f20ab92f63f8cec546bb049f1b (patch)
tree058796112a47c2ed5986adbe2bffcc28e1001546
parentfc8c59788e240244ccca48b21d391eb99e46b36a (diff)
downloadhaskell-wip/ci-shellcheck.tar.gz
gitlab-ci: Lint CI scripts with shellcheckwip/ci-shellcheck
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab/common.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e634cad6e..05bbae9993 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: 0da9c4be73f2d73868f610d20352af856e8f2727
+ DOCKER_REV: b91c5bcfdb1092979c467a3f2d7be7574f840739
# Sequential version number capturing the versions of all tools fetched by
# .gitlab/ci.sh. Used for invalidation of GitLab CI cache.
@@ -99,6 +99,7 @@ ghc-linters:
- .gitlab/linters/check-cpp.py commits $base $CI_COMMIT_SHA
- .gitlab/linters/check-version-number.sh
- python3 utils/checkUniques/check-uniques.py .
+ - shellcheck .gitlab/ci.sh .gitlab/common.sh
dependencies: []
tags:
- lint
diff --git a/.gitlab/common.sh b/.gitlab/common.sh
index 6c487b9911..759ef10110 100644
--- a/.gitlab/common.sh
+++ b/.gitlab/common.sh
@@ -4,6 +4,7 @@
# ----------------------
# shellcheck disable=SC2034
+# shellcheck disable=SC1117
# Colors
BLACK="0;30"