diff options
| author | kolaente <k@knt.li> | 2019-10-08 22:42:30 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-10-08 16:42:30 -0400 |
| commit | 7408942c802cd11c0fe4b9498a0de26964893cfd (patch) | |
| tree | 2fa7a4869337dff5f9ae71135385216341bdf692 | |
| parent | f05a3353f4788ade6156bf132796690cf3154fd3 (diff) | |
| download | gitea-7408942c802cd11c0fe4b9498a0de26964893cfd.tar.gz gitea-7408942c802cd11c0fe4b9498a0de26964893cfd.zip | |
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>
| -rw-r--r-- | .golangci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.golangci.yml b/.golangci.yml index 9c78a83451..fd7393372b 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: @@ -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 |