From 781b679d470d47b037da759bc0736c8d0e922b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 2 Oct 2019 10:11:15 +0200 Subject: [PATCH] Release: Fix issue with tag script on osx (#19557) * Release: Fix issue with release script on osx * Added shellcheck ignore rule --- Makefile | 2 +- scripts/tag_release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5cb61ee6ba4..7056e4c2184 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ lint-go: go-vet golangci-lint revive revive-alerting gosec # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts shellcheck: $(SH_FILES) @docker run --rm -v "$$PWD:/mnt" koalaman/shellcheck:stable \ - $(SH_FILES) -e SC1071 + $(SH_FILES) -e SC1071 -e SC2162 run: scripts/go/bin/bra @scripts/go/bin/bra run diff --git a/scripts/tag_release.sh b/scripts/tag_release.sh index 9b6d31b1f80..f215cef5bc7 100755 --- a/scripts/tag_release.sh +++ b/scripts/tag_release.sh @@ -31,7 +31,7 @@ git tag -v "${_tag}" echo "Make sure the tag is signed as expected" echo "press [y] to push the tags" -read -n -r 1 confirm +read -n 1 confirm if [ "${confirm}" == "y" ]; then git push origin "${_branch}" --tags