Merge pull request #4315 from tstromberg/lintersss

Fallback to golangci-lint v1.16.0 if necessary, quiet test.sh output

Makefile

@@ -223,13 +223,16 @@ vet:
 
 # Once v1.16.1+ is released, replace with
 # curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh \
-#  | bash -s -- -b out/linters v1.16.0
-
+#  | bash -s -- -b out/linters v1.16.1
 out/linters/golangci-lint:
-	mkdir -p out/linters \
-	  && cd out/linters \
-	  && test -f go.mod || go mod init linters \
-	  && go get -u github.com/golangci/golangci-lint/cmd/golangci-lint@692dacb773b703162c091c2d8c59f9cd2d6801db >/dev/null
+	mkdir -p out/linters
+	cd out/linters
+	test -f go.mod || go mod init linters
+	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint@692dacb773b703162c091c2d8c59f9cd2d6801db 2>&1 \
+	  | grep -v "go: finding"
+	test -x $(GOPATH)/bin/golangci-lint \
+	  || curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh \
+	  | sh -s -- -b $(GOPATH)/bin v1.16.0
 	cp -f $(GOPATH)/bin/golangci-lint out/linters/golangci-lint
 
 .PHONY: lint

test.sh

@@ -19,7 +19,7 @@ set -eu -o pipefail
 exitcode=0
 
 echo "= go mod ================================================================"
-go mod download >/dev/null || ((exitcode+=1))
+go mod download 2>&1 | grep -v "go: finding" || true
 go mod tidy -v && echo ok || ((exitcode+=2))
 
 echo "= make lint ============================================================="