From bee51e5eedf7b433f2d0dce4c89a33c24aa25e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Wed, 5 Apr 2023 20:21:16 +0200 Subject: [PATCH] Don't use hack/make.sh for validate-gofmt 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-gofmt => validate-gofmt.sh} | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename hack/{make/validate-gofmt => validate-gofmt.sh} (98%) diff --git a/Makefile b/Makefile index 53516a0a..8d521531 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 + BUILDTAGS="${BUILDTAGS}" hack/make.sh validate-git-marks + hack/validate-gofmt.sh hack/validate-lint.sh BUILDTAGS="${BUILDTAGS}" hack/validate-vet.sh diff --git a/hack/make/validate-gofmt b/hack/validate-gofmt.sh similarity index 98% rename from hack/make/validate-gofmt rename to hack/validate-gofmt.sh index b589eb33..72757215 100755 --- a/hack/make/validate-gofmt +++ b/hack/validate-gofmt.sh @@ -23,5 +23,5 @@ else echo 'Please reformat the above files using "gofmt -s -w" and commit the result.' echo } >&2 - false + exit 1 fi