diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-13 10:38:03 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-13 10:38:03 +0300 |
| commit | c89bec9b2054af1b2d68caf289a1a77f68fd3124 (patch) | |
| tree | de113ecafce8f046f9e64712557f558309a95703 | |
| parent | 7e0dccaed3f2ee60d0b03c0e2382c912ea59c729 (diff) | |
| parent | e095c2babf6ac210139dd0b8ccc61beb4dd332a1 (diff) | |
Merge branch 'pks-golangci-lint-timeout' into 'master'
golangci-lint: Increase timeout to 10 minutes
See merge request gitlab-org/gitaly!4707
| -rw-r--r-- | .golangci.yml | 2 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.golangci.yml b/.golangci.yml index 31c722364..a6c5a1351 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,7 @@ # options for analysis running run: # timeout for analysis, e.g. 30s, 5m, default is 1m - timeout: 5m + timeout: 10m modules-download-mode: readonly # list of useful linters could be found at https://github.com/golangci/awesome-go-linters @@ -92,7 +92,7 @@ ifdef FIPS_MODE endif # Dependency versions -GOLANGCI_LINT_VERSION ?= v1.46.1 +GOLANGCI_LINT_VERSION ?= v1.46.2 PROTOLINT_VERSION ?= v0.38.1 GOCOVER_COBERTURA_VERSION ?= aaee18c8195c3f2d90e5ef80ca918d265463842a GOFUMPT_VERSION ?= v0.3.1 |