From 43090b2917c9905aa579fd9dc1ea789309ed055e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 5 Apr 2023 19:57:03 +0200 Subject: [PATCH] Don't use hack/make.sh for validate-vet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hack/make.sh now does not make a difference, so simplify. Signed-off-by: Miloslav Trmač --- Makefile | 3 ++- hack/{make/validate-vet => validate-vet.sh} | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename hack/{make/validate-vet => validate-vet.sh} (97%) diff --git a/Makefile b/Makefile index d6264b81..e04e3481 100644 --- a/Makefile +++ b/Makefile @@ -223,7 +223,8 @@ test-all-local: validate-local validate-docs test-unit-local .PHONY: validate-local validate-local: - BUILDTAGS="${BUILDTAGS}" hack/make.sh validate-git-marks validate-gofmt validate-lint validate-vet + BUILDTAGS="${BUILDTAGS}" hack/make.sh validate-git-marks validate-gofmt validate-lint + BUILDTAGS="${BUILDTAGS}" hack/validate-vet.sh # This invokes bin/skopeo, hence cannot be run as part of validate-local .PHONY: validate-docs diff --git a/hack/make/validate-vet b/hack/validate-vet.sh similarity index 97% rename from hack/make/validate-vet rename to hack/validate-vet.sh index 6a66cd68..577c5802 100755 --- a/hack/make/validate-vet +++ b/hack/validate-vet.sh @@ -12,5 +12,5 @@ else echo 'Please fix the above errors. You can test via "go vet" and commit the result.' echo } >&2 - false + exit 1 fi