Merge a45058b into 0f0da27

.golangci.yml

@@ -36,6 +36,6 @@ linters:
     - varcheck
 
 run:
-  deadline: 5m
+  timeout: 5m
   skip-dirs:
     - vendor

.travis.yml

@@ -22,6 +22,7 @@ before_install:
 install:
   - go get -v golang.org/x/tools/cmd/cover
   - go get -v github.com/mattn/goveralls
+  - make install-lint
 before_script:
   - make lint
   - make test

Makefile

@@ -13,7 +13,9 @@ VERSION_NIGHTLY := ${GIT_COMMIT_DATE}.${GIT_HASH_SHORT}
 VERSION_RELEASE := ${GIT_TAG}.${GIT_COMMIT}
 
 GO_VERSION := $(shell go version | cut -d' ' -f3)
+GO_PATH := $(shell go env GOPATH)
 GO111MODULE := on
+GOLANGCI_LINT_VERSION := "v1.20.0"
 
 VENDOR := "SKB Kontur"
 URL := "https://github.com/moira-alert/moira"
@@ -22,10 +24,14 @@ LICENSE := "MIT"
 .PHONY: default
 default: test build
 
+.PHONY: install-lint
+install-lint:
+	# The recommended way to install golangci-lint into CI/CD
+	wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GO_PATH}/bin ${GOLANGCI_LINT_VERSION}
+
 .PHONY: lint
 lint:
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.18.0
-	GOGC=30 golangci-lint run
+	GOGC=50 golangci-lint run
 
 .PHONY: test
 test: