diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml index 54159cd3b008..fb0895eb3700 100644 --- a/.golangci.next.reference.yml +++ b/.golangci.next.reference.yml @@ -4159,7 +4159,7 @@ output: # Options for analysis running. run: - # Timeout for analysis, e.g. 30s, 5m. + # Timeout for analysis, e.g. 30s, 5m, 5m30s. # If the value is lower or equal to 0, the timeout is disabled. # Default: 1m timeout: 5m diff --git a/.golangci.reference.yml b/.golangci.reference.yml index 54159cd3b008..fb0895eb3700 100644 --- a/.golangci.reference.yml +++ b/.golangci.reference.yml @@ -4159,7 +4159,7 @@ output: # Options for analysis running. run: - # Timeout for analysis, e.g. 30s, 5m. + # Timeout for analysis, e.g. 30s, 5m, 5m30s. # If the value is lower or equal to 0, the timeout is disabled. # Default: 1m timeout: 5m diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json index b52a2f532dc8..f80ccf06235a 100644 --- a/jsonschema/golangci.jsonschema.json +++ b/jsonschema/golangci.jsonschema.json @@ -472,9 +472,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json index b52a2f532dc8..f80ccf06235a 100644 --- a/jsonschema/golangci.next.jsonschema.json +++ b/jsonschema/golangci.next.jsonschema.json @@ -472,9 +472,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.57.jsonschema.json b/jsonschema/golangci.v1.57.jsonschema.json index 8ef0588837f9..a97c0d42919a 100644 --- a/jsonschema/golangci.v1.57.jsonschema.json +++ b/jsonschema/golangci.v1.57.jsonschema.json @@ -351,9 +351,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.58.jsonschema.json b/jsonschema/golangci.v1.58.jsonschema.json index d7f790cdcca6..d0bdc8d7b95e 100644 --- a/jsonschema/golangci.v1.58.jsonschema.json +++ b/jsonschema/golangci.v1.58.jsonschema.json @@ -353,9 +353,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.59.jsonschema.json b/jsonschema/golangci.v1.59.jsonschema.json index d1ef23834332..cc3e63655bc1 100644 --- a/jsonschema/golangci.v1.59.jsonschema.json +++ b/jsonschema/golangci.v1.59.jsonschema.json @@ -435,9 +435,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.60.jsonschema.json b/jsonschema/golangci.v1.60.jsonschema.json index 087ad65b89cb..b8920ae06f94 100644 --- a/jsonschema/golangci.v1.60.jsonschema.json +++ b/jsonschema/golangci.v1.60.jsonschema.json @@ -441,9 +441,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.61.jsonschema.json b/jsonschema/golangci.v1.61.jsonschema.json index 18bd56fbea14..a574b0195bca 100644 --- a/jsonschema/golangci.v1.61.jsonschema.json +++ b/jsonschema/golangci.v1.61.jsonschema.json @@ -440,9 +440,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.62.jsonschema.json b/jsonschema/golangci.v1.62.jsonschema.json index 2e93a2fc5403..3ca3593b2600 100644 --- a/jsonschema/golangci.v1.62.jsonschema.json +++ b/jsonschema/golangci.v1.62.jsonschema.json @@ -442,9 +442,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.", diff --git a/jsonschema/golangci.v1.63.jsonschema.json b/jsonschema/golangci.v1.63.jsonschema.json index a5992b16c740..c54dd6904d13 100644 --- a/jsonschema/golangci.v1.63.jsonschema.json +++ b/jsonschema/golangci.v1.63.jsonschema.json @@ -463,9 +463,9 @@ "timeout": { "description": "Timeout for the analysis.", "type": "string", - "pattern": "^\\d*[sm]$", + "pattern": "^((\\d+h)?(\\d+m)?(\\d+(?:\\.\\d)?s)?|0)$", "default": "1m", - "examples": ["30s", "5m"] + "examples": ["30s", "5m", "5m30s"] }, "issues-exit-code": { "description": "Exit code when at least one issue was found.",