From b353999bb52969faf5ce47ac342d5b08479e4894 Mon Sep 17 00:00:00 2001 From: Oleg Sucharevich Date: Sun, 9 Aug 2020 14:36:51 +0300 Subject: [PATCH 1/2] update golangci-lint --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2baaadfe..af852ea6e 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ setup: clean $Q go env ifndef HAS_GOLANGCI - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.19.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.30.0 endif .PHONY: mod From ac565b5897a66825efd92650e839879a1885f474 Mon Sep 17 00:00:00 2001 From: Oleg Sucharevich Date: Mon, 10 Aug 2020 19:46:59 +0300 Subject: [PATCH 2/2] update deprecated flag --- .golangci.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 18f63cf99..9b14a7fc9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: - deadline: 4m + timeout: 5m skip-dirs: skip-files: diff --git a/Makefile b/Makefile index af852ea6e..d476bcc3a 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ test: test-style go vet $(GO_FILES) test-style: setup @echo "==> Running static validations and linters <==" - # Setting deadline to 5m as deafult is 1m - golangci-lint run --deadline=5m + # Setting timeout to 5m as deafult is 1m + golangci-lint run --timeout=5m sanity-test: go test -v ./test/sanity build: setup