Skip to content

Commit 3822b0a

Browse files
authored
Merge pull request #342 from python-jsonschema/vendor-schemas-auto
Changes by create-pull-request action
2 parents 1effb18 + 767f609 commit 3822b0a

File tree

11 files changed

+172
-311
lines changed

11 files changed

+172
-311
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 (2023-10-17)
13+
- Update vendored schemas (2023-10-30)
1414

1515
0.27.0
1616
------

src/check_jsonschema/builtin_schemas/vendor/buildkite.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
".buildkite/pipeline.*.yaml",
1616
".buildkite/pipeline.*.json"
1717
],
18+
"required": [
19+
"steps"
20+
],
1821
"definitions": {
1922
"commonOptions": {
2023
"allowDependencyFailure": {
@@ -1234,7 +1237,7 @@
12341237
"$ref": "#/definitions/commonOptions/dependsOn"
12351238
},
12361239
"group": {
1237-
"type": "string",
1240+
"type": [ "string", "null" ],
12381241
"description": "The name to give to this group of steps",
12391242
"examples": [ "Tests" ]
12401243
},
@@ -1256,6 +1259,12 @@
12561259
"name": {
12571260
"$ref": "#/definitions/groupStep/properties/label"
12581261
},
1262+
"allow_dependency_failure": {
1263+
"$ref": "#/definitions/commonOptions/allowDependencyFailure"
1264+
},
1265+
"notify": {
1266+
"$ref": "#/definitions/commonOptions/buildNotify"
1267+
},
12591268
"steps": {
12601269
"type": "array",
12611270
"description": "A list of steps",
@@ -1278,7 +1287,7 @@
12781287
"minSize": 1
12791288
},
12801289
"type": {
1281-
"type": "string",
1290+
"type": [ "string" ],
12821291
"enum": [ "group" ]
12831292
}
12841293
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cbef0847a483e84263925ff5c712cc1b3984c7cf420ccb35049b61e0840664bb
1+
31ccdd15c66d956fc260988de3794f85f8ad66e5091f433a315d7f471c3fd045

src/check_jsonschema/builtin_schemas/vendor/github-workflows.json

Lines changed: 7 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -569,32 +569,10 @@
569569
"runs-on": {
570570
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idruns-on",
571571
"description": "The type of machine to run the job on. The machine can be either a GitHub-hosted runner, or a self-hosted runner.",
572-
"oneOf": [
572+
"anyOf": [
573573
{
574574
"$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#github-hosted-runners",
575-
"type": "string",
576-
"enum": [
577-
"macos-10.15",
578-
"macos-11",
579-
"macos-12",
580-
"macos-12-xl",
581-
"macos-13",
582-
"macos-13-xl",
583-
"macos-latest",
584-
"macos-latest-xl",
585-
"self-hosted",
586-
"ubuntu-18.04",
587-
"ubuntu-20.04",
588-
"ubuntu-22.04",
589-
"ubuntu-latest",
590-
"ubuntu-latest-4-cores",
591-
"ubuntu-latest-8-cores",
592-
"ubuntu-latest-16-cores",
593-
"windows-2019",
594-
"windows-2022",
595-
"windows-latest",
596-
"windows-latest-8-cores"
597-
]
575+
"type": "string"
598576
},
599577
{
600578
"$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#self-hosted-runners",
@@ -603,99 +581,10 @@
603581
{
604582
"items": [
605583
{
606-
"const": "self-hosted"
607-
}
608-
],
609-
"minItems": 1,
610-
"additionalItems": {
611-
"type": "string"
612-
}
613-
},
614-
{
615-
"items": [
616-
{
617-
"const": "self-hosted"
618-
},
619-
{
620-
"$ref": "#/definitions/machine"
621-
}
622-
],
623-
"minItems": 2,
624-
"additionalItems": {
625-
"type": "string"
626-
}
627-
},
628-
{
629-
"items": [
630-
{
631-
"const": "self-hosted"
632-
},
633-
{
634-
"$ref": "#/definitions/architecture"
635-
}
636-
],
637-
"minItems": 2,
638-
"additionalItems": {
639-
"type": "string"
640-
}
641-
},
642-
{
643-
"items": [
644-
{
645-
"const": "self-hosted"
646-
},
647-
{
648-
"$ref": "#/definitions/machine"
649-
},
650-
{
651-
"$ref": "#/definitions/architecture"
652-
}
653-
],
654-
"minItems": 3,
655-
"additionalItems": {
656-
"type": "string"
657-
}
658-
},
659-
{
660-
"items": [
661-
{
662-
"const": "self-hosted"
663-
},
664-
{
665-
"$ref": "#/definitions/architecture"
666-
},
667-
{
668-
"$ref": "#/definitions/machine"
669-
}
670-
],
671-
"minItems": 3,
672-
"additionalItems": {
673-
"type": "string"
674-
}
675-
},
676-
{
677-
"items": [
678-
{
679-
"const": "linux"
680-
}
681-
],
682-
"minItems": 2,
683-
"maxItems": 2,
684-
"additionalItems": {
685-
"type": "string"
686-
}
687-
},
688-
{
689-
"items": [
690-
{
691-
"const": "windows"
584+
"type": "string"
692585
}
693586
],
694-
"minItems": 2,
695-
"maxItems": 2,
696-
"additionalItems": {
697-
"type": "string"
698-
}
587+
"minItems": 1
699588
}
700589
]
701590
},
@@ -723,6 +612,9 @@
723612
},
724613
{
725614
"$ref": "#/definitions/stringContainingExpressionSyntax"
615+
},
616+
{
617+
"$ref": "#/definitions/expressionSyntax"
726618
}
727619
]
728620
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7722e9048084e044d6a74de8692a3f7562bfcb7ca12cccbe77745d7fd4cb2123
1+
d6b4a34d766fdb5f328dd0580fb6845470a25e4c1dca0b5d1459724193e26bde

src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,9 +2093,15 @@
20932093
"description": "A path to a directory that contains the files to be published with Pages",
20942094
"type": "string"
20952095
},
2096-
"pages_path_prefix": {
2097-
"description": "The path prefix identifier for this version of pages. Allows creation of multiple versions of the same site with different path prefixes",
2098-
"type": "string"
2096+
"pages": {
2097+
"type": "object",
2098+
"additionalProperties": false,
2099+
"properties": {
2100+
"path_prefix": {
2101+
"type": "string",
2102+
"markdownDescription": "The GitLab Pages URL path prefix used in this version of pages."
2103+
}
2104+
}
20992105
}
21002106
},
21012107
"oneOf": [
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d8853998ead8e2452590fbc9f66466ba79760f8e57cc395b5ece2d8a97755e3a
1+
3d9c02dd6ed7e1f948fe5d0d0cacee98c7b270923b956ce13a478c40f92c25f1

0 commit comments

Comments
 (0)