From 7408942c802cd11c0fe4b9498a0de26964893cfd Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 8 Oct 2019 22:42:30 +0200 Subject: [PATCH] Update golangci to v1.20 (#8432) * Update golangci to v1.20 Signed-off-by: kolaente * Use the timeout flag instead of deadline, move it to config Signed-off-by: kolaente --- .golangci.yml | 3 +++ Makefile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9c78a834513d..fd7393372be4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -19,6 +19,9 @@ linters: disable-all: true fast: false +run: + timeout: 3m + linters-settings: gocritic: disabled-checks: diff --git a/Makefile b/Makefile index e8220ef36c1a..953abe83b0c8 100644 --- a/Makefile +++ b/Makefile @@ -515,6 +515,6 @@ pr: golangci-lint: @hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ export BINARY="golangci-lint"; \ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.19.1; \ + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.20.0; \ fi - golangci-lint run --deadline=3m + golangci-lint run