ci: use fixed versions for staticcheck and golangci-lint

[safcm/safcm.git] / ci / run

diff --git a/ci/run b/ci/run
index 25b06420eda6d45480fe6046f6516c3255d6311c..88fe0cc381b8db5f7070719c9c2504f612432a9e 100755 (executable)
--- a/ci/run
+++ b/ci/run
@@ -12,19 +12,30 @@ if test $# -ne 0; then
     flags="$*"
 fi
 
+# Run additional tests in CI
+SAFCM_CI_RUN=1
+export SAFCM_CI_RUN
+
+# shellcheck disable=SC2086
 make $flags
+# shellcheck disable=SC2086
 make test $flags
+make lint
 
 # Strict umask
 umask 077
-rm -rf *
+rm -rf ./*
 git checkout .
+# shellcheck disable=SC2086
 make $flags
+# shellcheck disable=SC2086
 make test $flags
 
 # Additional static checks only run in CI
-go get honnef.co/go/tools/cmd/staticcheck
+go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
 staticcheck ./...
+go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.3
+golangci-lint run
 
 test -z "$(git clean -nd)" # any untracked files left?
 make clean