Merge pull request #5658 from prometheus/mr/workaround-golangci-lint-575

Work around golangci-lint issues
6 years ago · 61f1723c4a
parent 55f3a9fe4a ec7db0d541
commit 61f1723c4a
1 changed files with 3 additions and 1 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -248,7 +248,9 @@ proto:
 ifdef GOLANGCI_LINT
 $(GOLANGCI_LINT):
 	mkdir -p $(FIRST_GOPATH)/bin
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(FIRST_GOPATH)/bin $(GOLANGCI_LINT_VERSION)
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/$(GOLANGCI_LINT_VERSION)/install.sh \
+		| sed -e '/install -d/d' \
+		| sh -s -- -b $(FIRST_GOPATH)/bin $(GOLANGCI_LINT_VERSION)
 endif

 ifdef GOVENDOR