Skip to content

Commit 195e2c3

Browse files
authored
Merge pull request #7737 from oscr/shellcheck-0.9.0
🌱 Bump shellcheck version (0.8.0 -> 0.9.0)
2 parents a08dc2d + 97573c1 commit 195e2c3

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ GO_APIDIFF_PKG := github.com/joelanford/go-apidiff
141141
HADOLINT_VER := v2.10.0
142142
HADOLINT_FAILURE_THRESHOLD = warning
143143

144+
SHELLCHECK_VER := v0.9.0
145+
144146
KPROMO_VER := v3.4.5
145147
KPROMO_BIN := kpromo
146148
KPROMO := $(abspath $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER))
@@ -616,7 +618,7 @@ verify-boilerplate: ## Verify boilerplate text exists in each file
616618

617619
.PHONY: verify-shellcheck
618620
verify-shellcheck: ## Verify shell files
619-
TRACE=$(TRACE) ./hack/verify-shellcheck.sh
621+
TRACE=$(TRACE) ./hack/verify-shellcheck.sh $(SHELLCHECK_VER)
620622

621623
.PHONY: verify-tiltfile
622624
verify-tiltfile: ## Verify Tiltfile format

hack/verify-shellcheck.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ if [[ "${TRACE-0}" == "1" ]]; then
2121
set -o xtrace
2222
fi
2323

24-
VERSION="v0.8.0"
24+
if [ $# -ne 1 ]; then
25+
echo 1>&2 "$0: usage: ./verify-shellcheck.sh <version>"
26+
exit 2
27+
fi
28+
29+
VERSION=${1}
2530

2631
OS="unknown"
2732
if [[ "${OSTYPE}" == "linux"* ]]; then

0 commit comments

Comments
 (0)