From 804a109b26a9a2f4598d420379df5c3ff3567c0c Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Thu, 13 Jun 2019 13:24:28 +0300 Subject: [PATCH] Set BINARY variable for golangci-lint.sh (#1493) * Set BINARY variable for golangci-lint.sh * Set higher deadline for linter --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 89e5b2929..8dd2d19b8 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ RELEASE_BRANCH := develop RELEASE_DIR := /tmp/release-$(RELEASE_TAG) PRE_RELEASE := "1" RELEASE_TYPE := $(shell if [ $(PRE_RELEASE) = "0" ] ; then echo release; else echo pre-release ; fi) +GOLANGCI_BINARY=golangci-lint help: ##@other Show this help @perl -e '$(HELP_FUN)' $(MAKEFILE_LIST) @@ -269,11 +270,11 @@ canary-test: node-canary lint-install: @# The following installs a specific version of golangci-lint, which is appropriate for a CI server to avoid different results from build to build - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(GOPATH)/bin v1.17.1 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | BINARY=$(GOLANGCI_BINARY) bash -s -- -d -b $(GOPATH)/bin v1.17.1 lint: @echo "lint" - @golangci-lint run ./... + @golangci-lint run ./... --deadline=5m ci: lint canary-test test-unit test-e2e ##@tests Run all linters and tests at once