Update golangci to v1.20 (#8432)

* Update golangci to v1.20

Signed-off-by: kolaente <k@knt.li>

* Use the timeout flag instead of deadline, move it to config

Signed-off-by: kolaente <k@knt.li>
This commit is contained in:
kolaente 2019-10-08 22:42:30 +02:00 committed by techknowlogick
parent f05a3353f4
commit 7408942c80
2 changed files with 5 additions and 2 deletions

View file

@ -19,6 +19,9 @@ linters:
disable-all: true disable-all: true
fast: false fast: false
run:
timeout: 3m
linters-settings: linters-settings:
gocritic: gocritic:
disabled-checks: disabled-checks:

View file

@ -515,6 +515,6 @@ pr:
golangci-lint: golangci-lint:
@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
export BINARY="golangci-lint"; \ 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 fi
golangci-lint run --deadline=3m golangci-lint run