Skip to content

Commit 7c42f3a

Browse files
Fix schema not accepting valid time.Duration format
1 parent abfa051 commit 7c42f3a

11 files changed

+20
-20
lines changed

.golangci.next.reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4159,7 +4159,7 @@ output:
41594159

41604160
# Options for analysis running.
41614161
run:
4162-
# Timeout for analysis, e.g. 30s, 5m.
4162+
# Timeout for analysis, e.g. 30s, 5m, 5m30s.
41634163
# If the value is lower or equal to 0, the timeout is disabled.
41644164
# Default: 1m
41654165
timeout: 5m

.golangci.reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4159,7 +4159,7 @@ output:
41594159

41604160
# Options for analysis running.
41614161
run:
4162-
# Timeout for analysis, e.g. 30s, 5m.
4162+
# Timeout for analysis, e.g. 30s, 5m, 5m30s.
41634163
# If the value is lower or equal to 0, the timeout is disabled.
41644164
# Default: 1m
41654165
timeout: 5m

jsonschema/golangci.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,9 @@
472472
"timeout": {
473473
"description": "Timeout for the analysis.",
474474
"type": "string",
475-
"pattern": "^\\d*[sm]$",
475+
"pattern": "^(\\d*m)?\\d*[sm]$",
476476
"default": "1m",
477-
"examples": ["30s", "5m"]
477+
"examples": ["30s", "5m", "5m30s"]
478478
},
479479
"issues-exit-code": {
480480
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.next.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,9 @@
472472
"timeout": {
473473
"description": "Timeout for the analysis.",
474474
"type": "string",
475-
"pattern": "^\\d*[sm]$",
475+
"pattern": "^(\\d*m)?\\d*[sm]$",
476476
"default": "1m",
477-
"examples": ["30s", "5m"]
477+
"examples": ["30s", "5m", "5m30s"]
478478
},
479479
"issues-exit-code": {
480480
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.57.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@
351351
"timeout": {
352352
"description": "Timeout for the analysis.",
353353
"type": "string",
354-
"pattern": "^\\d*[sm]$",
354+
"pattern": "^(\\d*m)?\\d*[sm]$",
355355
"default": "1m",
356-
"examples": ["30s", "5m"]
356+
"examples": ["30s", "5m", "5m30s"]
357357
},
358358
"issues-exit-code": {
359359
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.58.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,9 @@
353353
"timeout": {
354354
"description": "Timeout for the analysis.",
355355
"type": "string",
356-
"pattern": "^\\d*[sm]$",
356+
"pattern": "^(\\d*m)?\\d*[sm]$",
357357
"default": "1m",
358-
"examples": ["30s", "5m"]
358+
"examples": ["30s", "5m", "5m30s"]
359359
},
360360
"issues-exit-code": {
361361
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.59.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@
435435
"timeout": {
436436
"description": "Timeout for the analysis.",
437437
"type": "string",
438-
"pattern": "^\\d*[sm]$",
438+
"pattern": "^(\\d*m)?\\d*[sm]$",
439439
"default": "1m",
440-
"examples": ["30s", "5m"]
440+
"examples": ["30s", "5m", "5m30s"]
441441
},
442442
"issues-exit-code": {
443443
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.60.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,9 @@
441441
"timeout": {
442442
"description": "Timeout for the analysis.",
443443
"type": "string",
444-
"pattern": "^\\d*[sm]$",
444+
"pattern": "^(\\d*m)?\\d*[sm]$",
445445
"default": "1m",
446-
"examples": ["30s", "5m"]
446+
"examples": ["30s", "5m", "5m30s"]
447447
},
448448
"issues-exit-code": {
449449
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.61.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,9 @@
440440
"timeout": {
441441
"description": "Timeout for the analysis.",
442442
"type": "string",
443-
"pattern": "^\\d*[sm]$",
443+
"pattern": "^(\\d*m)?\\d*[sm]$",
444444
"default": "1m",
445-
"examples": ["30s", "5m"]
445+
"examples": ["30s", "5m", "5m30s"]
446446
},
447447
"issues-exit-code": {
448448
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.62.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@
442442
"timeout": {
443443
"description": "Timeout for the analysis.",
444444
"type": "string",
445-
"pattern": "^\\d*[sm]$",
445+
"pattern": "^(\\d*m)?\\d*[sm]$",
446446
"default": "1m",
447-
"examples": ["30s", "5m"]
447+
"examples": ["30s", "5m", "5m30s"]
448448
},
449449
"issues-exit-code": {
450450
"description": "Exit code when at least one issue was found.",

jsonschema/golangci.v1.63.jsonschema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@
463463
"timeout": {
464464
"description": "Timeout for the analysis.",
465465
"type": "string",
466-
"pattern": "^\\d*[sm]$",
466+
"pattern": "^(\\d*m)?\\d*[sm]$",
467467
"default": "1m",
468-
"examples": ["30s", "5m"]
468+
"examples": ["30s", "5m", "5m30s"]
469469
},
470470
"issues-exit-code": {
471471
"description": "Exit code when at least one issue was found.",

0 commit comments

Comments
 (0)