Skip to content

Commit c906a72

Browse files
sirosensirosen
committed
Update vendored schemas
1 parent 46486cd commit c906a72

File tree

11 files changed

+181
-190
lines changed

11 files changed

+181
-190
lines changed

‎CHANGELOG.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Unreleased
1010

1111
.. vendor-insert-here
1212
13-
- Update vendored schemas (2024-11-24)
13+
- Update vendored schemas (2024-11-29)
1414

1515
0.29.4
1616
------

‎src/check_jsonschema/builtin_schemas/vendor/buildkite.json‎

Lines changed: 82 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
"enum": [ "*" ]
6262
},
6363
{
64-
"type": "number"
64+
"type": "integer"
6565
},
6666
{
6767
"type": "array",
68-
"items": { "type": "number" }
68+
"items": { "type": "integer" }
6969
}
7070
]
7171
},
@@ -198,11 +198,6 @@
198198
{ "NODE_ENV": "test" }
199199
]
200200
},
201-
"identifier": {
202-
"type": "string",
203-
"description": "A string identifier",
204-
"examples": [ "an-id" ]
205-
},
206201
"if": {
207202
"type": "string",
208203
"description": "A boolean expression that omits the step when false",
@@ -211,7 +206,8 @@
211206
"key": {
212207
"type": "string",
213208
"description": "A unique identifier for a step, must not resemble a UUID",
214-
"examples": [ "deploy-staging", "test-integration" ]
209+
"examples": [ "deploy-staging", "test-integration" ],
210+
"pattern": "^(?!^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$).*$"
215211
},
216212
"label": {
217213
"type": "string",
@@ -528,25 +524,21 @@
528524
{
529525
"type": "array",
530526
"items": {
531-
"anyOf": [
532-
{
533-
"type": "object",
534-
"properties": {
535-
"exit_status": {
536-
"description": "The exit status number that will cause this job to soft-fail",
537-
"anyOf": [
538-
{
539-
"type": "string",
540-
"enum": [ "*" ]
541-
},
542-
{
543-
"type": "number"
544-
}
545-
]
527+
"type": "object",
528+
"properties": {
529+
"exit_status": {
530+
"description": "The exit status number that will cause this job to soft-fail",
531+
"anyOf": [
532+
{
533+
"type": "string",
534+
"enum": [ "*" ]
535+
},
536+
{
537+
"type": "integer"
546538
}
547-
}
539+
]
548540
}
549-
]
541+
}
550542
}
551543
}
552544
]
@@ -575,18 +567,19 @@
575567
"fields": {
576568
"$ref": "#/definitions/fields"
577569
},
578-
"id": {
579-
"$ref": "#/definitions/identifier"
580-
},
581-
"identifier": {
582-
"$ref": "#/definitions/identifier"
583-
},
584570
"if": {
585571
"$ref": "#/definitions/if"
586572
},
587573
"key": {
588574
"$ref": "#/definitions/key"
589575
},
576+
"identifier": {
577+
"$ref": "#/definitions/blockStep/properties/key"
578+
},
579+
"id": {
580+
"$ref": "#/definitions/blockStep/properties/key",
581+
"deprecated": true
582+
},
590583
"label": {
591584
"$ref": "#/definitions/label"
592585
},
@@ -636,18 +629,19 @@
636629
"fields": {
637630
"$ref": "#/definitions/fields"
638631
},
639-
"id": {
640-
"$ref": "#/definitions/identifier"
641-
},
642-
"identifier": {
643-
"$ref": "#/definitions/identifier"
644-
},
645632
"if": {
646633
"$ref": "#/definitions/if"
647634
},
648635
"key": {
649636
"$ref": "#/definitions/key"
650637
},
638+
"identifier": {
639+
"$ref": "#/definitions/inputStep/properties/key"
640+
},
641+
"id": {
642+
"$ref": "#/definitions/inputStep/properties/key",
643+
"deprecated": true
644+
},
651645
"label": {
652646
"$ref": "#/definitions/label"
653647
},
@@ -754,18 +748,19 @@
754748
"env": {
755749
"$ref": "#/definitions/env"
756750
},
757-
"id": {
758-
"$ref": "#/definitions/identifier"
759-
},
760-
"identifier": {
761-
"$ref": "#/definitions/identifier"
762-
},
763751
"if": {
764752
"$ref": "#/definitions/if"
765753
},
766754
"key": {
767755
"$ref": "#/definitions/key"
768756
},
757+
"identifier": {
758+
"$ref": "#/definitions/commandStep/properties/key"
759+
},
760+
"id": {
761+
"$ref": "#/definitions/commandStep/properties/key",
762+
"deprecated": true
763+
},
769764
"label": {
770765
"$ref": "#/definitions/label"
771766
},
@@ -1130,18 +1125,25 @@
11301125
"depends_on": {
11311126
"$ref": "#/definitions/dependsOn"
11321127
},
1133-
"id": {
1134-
"$ref": "#/definitions/identifier"
1135-
},
1136-
"identifier": {
1137-
"$ref": "#/definitions/identifier"
1138-
},
11391128
"if": {
11401129
"$ref": "#/definitions/if"
11411130
},
11421131
"key": {
11431132
"$ref": "#/definitions/key"
11441133
},
1134+
"label": {
1135+
"$ref": "#/definitions/label"
1136+
},
1137+
"name": {
1138+
"$ref": "#/definitions/label"
1139+
},
1140+
"identifier": {
1141+
"$ref": "#/definitions/waitStep/properties/key"
1142+
},
1143+
"id": {
1144+
"$ref": "#/definitions/waitStep/properties/key",
1145+
"deprecated": true
1146+
},
11451147
"type": {
11461148
"type": "string",
11471149
"enum": [ "wait", "waiter" ]
@@ -1235,18 +1237,19 @@
12351237
"depends_on": {
12361238
"$ref": "#/definitions/dependsOn"
12371239
},
1238-
"id": {
1239-
"$ref": "#/definitions/identifier"
1240-
},
1241-
"identifier": {
1242-
"$ref": "#/definitions/identifier"
1243-
},
12441240
"if": {
12451241
"$ref": "#/definitions/if"
12461242
},
12471243
"key": {
12481244
"$ref": "#/definitions/key"
12491245
},
1246+
"identifier": {
1247+
"$ref": "#/definitions/triggerStep/properties/key"
1248+
},
1249+
"id": {
1250+
"$ref": "#/definitions/triggerStep/properties/key",
1251+
"deprecated": true
1252+
},
12501253
"label": {
12511254
"$ref": "#/definitions/label"
12521255
},
@@ -1268,7 +1271,10 @@
12681271
"$ref": "#/definitions/softFail"
12691272
}
12701273
},
1271-
"additionalProperties": false
1274+
"additionalProperties": false,
1275+
"required": [
1276+
"trigger"
1277+
]
12721278
},
12731279
"nestedTriggerStep": {
12741280
"type": "object",
@@ -1290,18 +1296,19 @@
12901296
"description": "The name to give to this group of steps",
12911297
"examples": [ "Tests" ]
12921298
},
1293-
"id": {
1294-
"$ref": "#/definitions/identifier"
1295-
},
1296-
"identifier": {
1297-
"$ref": "#/definitions/identifier"
1298-
},
12991299
"if": {
13001300
"$ref": "#/definitions/if"
13011301
},
13021302
"key": {
13031303
"$ref": "#/definitions/key"
13041304
},
1305+
"identifier": {
1306+
"$ref": "#/definitions/groupStep/properties/key"
1307+
},
1308+
"id": {
1309+
"$ref": "#/definitions/groupStep/properties/key",
1310+
"deprecated": true
1311+
},
13051312
"label": {
13061313
"$ref": "#/definitions/groupStep/properties/group"
13071314
},
@@ -1322,27 +1329,29 @@
13221329
"description": "A list of steps",
13231330
"items": {
13241331
"anyOf": [
1325-
{ "$ref": "#/definitions/stringBlockStep" },
13261332
{ "$ref": "#/definitions/blockStep" },
1327-
{ "$ref": "#/definitions/commandStep" },
1328-
{ "$ref": "#/definitions/nestedCommandStep" },
1329-
{ "$ref": "#/definitions/triggerStep" },
1330-
{ "$ref": "#/definitions/nestedTriggerStep" },
1331-
{ "$ref": "#/definitions/stringInputStep" },
1333+
{ "$ref": "#/definitions/nestedBlockStep" },
1334+
{ "$ref": "#/definitions/stringBlockStep" },
13321335
{ "$ref": "#/definitions/inputStep" },
13331336
{ "$ref": "#/definitions/nestedInputStep" },
1334-
{ "$ref": "#/definitions/stringWaitStep" },
1337+
{ "$ref": "#/definitions/stringInputStep" },
1338+
{ "$ref": "#/definitions/commandStep" },
1339+
{ "$ref": "#/definitions/nestedCommandStep" },
13351340
{ "$ref": "#/definitions/waitStep" },
1336-
{ "$ref": "#/definitions/nestedWaitStep" }
1341+
{ "$ref": "#/definitions/nestedWaitStep" },
1342+
{ "$ref": "#/definitions/stringWaitStep" },
1343+
{ "$ref": "#/definitions/triggerStep" },
1344+
{ "$ref": "#/definitions/nestedTriggerStep" }
13371345
]
13381346
},
1339-
"minSize": 1
1347+
"minItems": 1
13401348
},
13411349
"type": {
1342-
"type": [ "string" ],
1350+
"type": "string",
13431351
"enum": [ "group" ]
13441352
}
13451353
},
1354+
"required": ["steps"],
13461355
"additionalProperties": false
13471356
}
13481357
},
@@ -1369,9 +1378,9 @@
13691378
{ "$ref": "#/definitions/stringInputStep" },
13701379
{ "$ref": "#/definitions/commandStep" },
13711380
{ "$ref": "#/definitions/nestedCommandStep" },
1372-
{ "$ref": "#/definitions/stringWaitStep" },
13731381
{ "$ref": "#/definitions/waitStep" },
13741382
{ "$ref": "#/definitions/nestedWaitStep" },
1383+
{ "$ref": "#/definitions/stringWaitStep" },
13751384
{ "$ref": "#/definitions/triggerStep" },
13761385
{ "$ref": "#/definitions/nestedTriggerStep" },
13771386
{ "$ref": "#/definitions/groupStep" }

‎src/check_jsonschema/builtin_schemas/vendor/mergify.json‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -884,9 +884,6 @@
884884
},
885885
{
886886
"const": "from_requested_reviewers",
887-
"enum": [
888-
"from_requested_reviewers"
889-
],
890887
"type": "string"
891888
}
892889
],
@@ -908,9 +905,6 @@
908905
},
909906
{
910907
"const": "from_requested_reviewers",
911-
"enum": [
912-
"from_requested_reviewers"
913-
],
914908
"type": "string"
915909
}
916910
],
@@ -1646,16 +1640,10 @@
16461640
"anyOf": [
16471641
{
16481642
"const": "NONE",
1649-
"enum": [
1650-
"NONE"
1651-
],
16521643
"type": "string"
16531644
},
16541645
{
16551646
"const": "PR_MERGED",
1656-
"enum": [
1657-
"PR_MERGED"
1658-
],
16591647
"type": "string"
16601648
},
16611649
{
@@ -2511,9 +2499,6 @@
25112499
"anyOf": [
25122500
{
25132501
"const": "fast-forward",
2514-
"enum": [
2515-
"fast-forward"
2516-
],
25172502
"type": "string"
25182503
},
25192504
{
@@ -2525,6 +2510,7 @@
25252510
"title": "Queue Branch Merge Method"
25262511
},
25272512
"queue_branch_prefix": {
2513+
"default": "mergify/merge-queue/",
25282514
"title": "Queue Branch Prefix",
25292515
"type": "string"
25302516
},
@@ -2774,9 +2760,6 @@
27742760
"anyOf": [
27752761
{
27762762
"const": "fast-forward",
2777-
"enum": [
2778-
"fast-forward"
2779-
],
27802763
"type": "string"
27812764
},
27822765
{
@@ -2788,6 +2771,7 @@
27882771
"title": "Queue Branch Merge Method"
27892772
},
27902773
"queue_branch_prefix": {
2774+
"default": "mergify/merge-queue/",
27912775
"title": "Queue Branch Prefix",
27922776
"type": "string"
27932777
},

0 commit comments

Comments
 (0)