Skip to content

Commit 28d3cec

Browse files
committed
Rename deadline config to timeout in golangci-lint config
This was renamed in golangci/golangci-lint#793.
1 parent 1257be9 commit 28d3cec

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.gitlab/ci/test.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ code_quality:
9999
allow_failure: true
100100
variables:
101101
REPORT_FILE: gl-code-quality-report.json
102-
LINT_FLAGS: "--color never --deadline 15m"
102+
LINT_FLAGS: "--color never --timeout 15m"
103103
OUT_FORMAT: code-climate
104104
GOLANGLINT_VERSION: "" # Don't add version suffix to Makefile's GOLANGLINT (use plain golangci-lint from image)
105105
before_script:

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
concurrency: 8
3-
deadline: 1m
3+
timeout: 1m
44
issues-exit-code: 1
55
tests: true
66
skip-dirs:

0 commit comments

Comments
 (0)