diff --git a/Makefile b/Makefile index 179bf4da..d7da7f74 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,7 @@ test-all-local: validate-local validate-docs test-unit-local validate-local: hack/validate-git-marks.sh hack/validate-gofmt.sh - GOBIN=$(GOBIN) hack/validate-lint.sh + $(GOBIN)/golangci-lint run --build-tags "${BUILDTAGS}" BUILDTAGS="${BUILDTAGS}" hack/validate-vet.sh # This invokes bin/skopeo, hence cannot be run as part of validate-local diff --git a/hack/validate-lint.sh b/hack/validate-lint.sh deleted file mode 100755 index e1e339b2..00000000 --- a/hack/validate-lint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -errors=$($GOBIN/golangci-lint run --build-tags "${BUILDTAGS}" 2>&1) - -if [ "$?" -eq 0 ]; then - echo 'Congratulations! All Go source files have been linted.' -else - { - echo "Errors from golangci-lint:" - echo "$errors" - echo - echo 'Please fix the above errors. You can test via "golangci-lint" and commit the result.' - echo - } >&2 - exit 1 -fi