Skip to content

Commit bf1ad2b

Browse files
committed
review: disable timeout by default
1 parent dd462d5 commit bf1ad2b

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

.golangci.next.reference.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4131,7 +4131,7 @@ output:
41314131
run:
41324132
# Timeout for analysis, e.g. 30s, 5m.
41334133
# If the value is lower or equal to 0, the timeout is disabled.
4134-
# Default: 15m
4134+
# Default: 0 (disabled)
41354135
timeout: 5m
41364136

41374137
# The mode used to evaluate relative paths.

.golangci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,3 @@ linters-settings:
202202
- name: unused-parameter
203203
- name: unused-receiver
204204

205-
run:
206-
timeout: 5m

jsonschema/golangci.next.jsonschema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3744,10 +3744,10 @@
37443744
"examples": [4]
37453745
},
37463746
"timeout": {
3747-
"description": "Timeout for the analysis.",
3747+
"description": "Timeout for total work. Disabled by default",
37483748
"type": "string",
37493749
"pattern": "^\\d*[sm]$",
3750-
"default": "1m",
3750+
"default": "0",
37513751
"examples": ["30s", "5m"]
37523752
},
37533753
"issues-exit-code": {

pkg/commands/flagsets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func setupRunFlagSet(v *viper.Viper, fs *pflag.FlagSet) {
5353
internal.AddHackedStringSlice(fs, "build-tags", color.GreenString("Build tags"))
5454

5555
internal.AddFlagAndBind(v, fs, fs.Duration, "timeout", "run.timeout", defaultTimeout,
56-
color.GreenString("Timeout for total work. If <= 0, the timeout is disabled"))
56+
color.GreenString("Timeout for total work. Disabled by default"))
5757

5858
internal.AddFlagAndBind(v, fs, fs.Bool, "tests", "run.tests", true, color.GreenString("Analyze tests (*_test.go)"))
5959

pkg/commands/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/golangci/golangci-lint/pkg/timeutils"
4444
)
4545

46-
const defaultTimeout = 15 * time.Minute
46+
const defaultTimeout = 0 * time.Minute
4747

4848
const (
4949
// envFailOnWarnings value: "1"

0 commit comments

Comments
 (0)