From 1126da09c6cd68e24492e6f74305695efc6548e8 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 18 Mar 2021 11:06:27 +0100 Subject: [PATCH] Squashed 'release-tools/' changes from 1748b16b..95eac336 95eac336 Merge pull request #137 from pohly/fix-go-version-check 437e4311 verify-go-version.sh: fix check after removal of travis.yml git-subtree-dir: release-tools git-subtree-split: 95eac33629ea9c586c4efcb7ad875191162464b2 --- verify-go-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verify-go-version.sh b/verify-go-version.sh index d130126a1..c235e74fe 100755 --- a/verify-go-version.sh +++ b/verify-go-version.sh @@ -31,7 +31,7 @@ version=$("$GO" version) || die "determining version of $GO failed" majorminor=$(echo "$version" | sed -e 's/.*go\([0-9]*\)\.\([0-9]*\).*/\1.\2/') # SC1091: Not following: release-tools/prow.sh was not specified as input (see shellcheck -x). # shellcheck disable=SC1091 -expected=$(. release-tools/prow.sh && echo "$$CSI_PROW_GO_VERSION_BUILD") +expected=$(. release-tools/prow.sh >/dev/null && echo "$CSI_PROW_GO_VERSION_BUILD") if [ "$majorminor" != "$expected" ]; then cat >&2 <