Skip to content

Commit e541734

Browse files
sirosensirosen
authored
Update vendored schemas (#532)
And update RTD schema to use 'main'. The main branch for the RTD repo was renamed from 'master'.
1 parent f4dd2d2 commit e541734

File tree

8 files changed

+170
-135
lines changed

8 files changed

+170
-135
lines changed

‎CHANGELOG.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Unreleased
1010

1111
.. vendor-insert-here
1212
13-
- Update vendored schemas: renovate, taskfile (2025-02-23)
13+
- Update vendored schemas: circle-ci, github-workflows, mergify, renovate, taskfile
14+
(2025-02-28)
1415

1516
0.31.2
1617
------

‎src/check_jsonschema/builtin_schemas/vendor/circle-ci.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,8 @@
13211321
"ubuntu-2404:2024.05.1",
13221322
"ubuntu-2404:current",
13231323
"ubuntu-2404:edge",
1324+
"android:2024.11.1",
1325+
"android:2024.07.1",
13241326
"android:2024.04.1",
13251327
"android:2024.01.1",
13261328
"android:2023.11.1",
@@ -1425,7 +1427,12 @@
14251427
"macOSResourceClass": {
14261428
"description": "Amount of CPU and RAM allocated for each job. View [available resource classes](https://circleci.com/docs/configuration-reference/#macos-execution-environment).",
14271429
"type": "string",
1428-
"enum": ["macos.m1.medium.gen1", "macos.m1.large.gen1"]
1430+
"enum": [
1431+
"macos.m1.medium.gen1",
1432+
"macos.m1.large.gen1",
1433+
"m2pro.medium",
1434+
"m2pro.large"
1435+
]
14291436
},
14301437
"xcodeVersion": {
14311438
"description": "The version of Xcode to use. View [available versions](https://circleci.com/developer/machine/image/xcode)",

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

+126-129
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,131 @@
843843
},
844844
"required": ["runs-on"],
845845
"additionalProperties": false
846+
},
847+
"workflowDispatchInput": {
848+
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id",
849+
"description": "A string identifier to associate with the input. The value of <input_id> is a map of the input's metadata. The <input_id> must be a unique identifier within the inputs object. The <input_id> must start with a letter or _ and contain only alphanumeric characters, -, or _.",
850+
"type": "object",
851+
"properties": {
852+
"description": {
853+
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription",
854+
"description": "A string description of the input parameter.",
855+
"type": "string"
856+
},
857+
"deprecationMessage": {
858+
"description": "A string shown to users using the deprecated input.",
859+
"type": "string"
860+
},
861+
"required": {
862+
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired",
863+
"description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.",
864+
"type": "boolean"
865+
},
866+
"default": {
867+
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault",
868+
"description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file."
869+
},
870+
"type": {
871+
"$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype",
872+
"description": "A string representing the type of the input.",
873+
"type": "string",
874+
"enum": ["string", "choice", "boolean", "number", "environment"]
875+
},
876+
"options": {
877+
"$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows",
878+
"description": "The options of the dropdown list, if the type is a choice.",
879+
"type": "array",
880+
"items": {
881+
"type": "string"
882+
},
883+
"minItems": 1
884+
}
885+
},
886+
"allOf": [
887+
{
888+
"if": {
889+
"properties": {
890+
"type": {
891+
"const": "string"
892+
}
893+
},
894+
"required": ["type"]
895+
},
896+
"then": {
897+
"properties": {
898+
"default": {
899+
"type": "string"
900+
}
901+
}
902+
}
903+
},
904+
{
905+
"if": {
906+
"properties": {
907+
"type": {
908+
"const": "boolean"
909+
}
910+
},
911+
"required": ["type"]
912+
},
913+
"then": {
914+
"properties": {
915+
"default": {
916+
"type": "boolean"
917+
}
918+
}
919+
}
920+
},
921+
{
922+
"if": {
923+
"properties": {
924+
"type": {
925+
"const": "number"
926+
}
927+
},
928+
"required": ["type"]
929+
},
930+
"then": {
931+
"properties": {
932+
"default": {
933+
"type": "number"
934+
}
935+
}
936+
}
937+
},
938+
{
939+
"if": {
940+
"properties": {
941+
"type": {
942+
"const": "environment"
943+
}
944+
},
945+
"required": ["type"]
946+
},
947+
"then": {
948+
"properties": {
949+
"default": {
950+
"type": "string"
951+
}
952+
}
953+
}
954+
},
955+
{
956+
"if": {
957+
"properties": {
958+
"type": {
959+
"const": "choice"
960+
}
961+
},
962+
"required": ["type"]
963+
},
964+
"then": {
965+
"required": ["options"]
966+
}
967+
}
968+
],
969+
"required": ["description"],
970+
"additionalProperties": false
846971
}
847972
},
848973
"properties": {
@@ -1469,135 +1594,7 @@
14691594
"type": "object",
14701595
"patternProperties": {
14711596
"^[_a-zA-Z][a-zA-Z0-9_-]*$": {
1472-
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id",
1473-
"description": "A string identifier to associate with the input. The value of <input_id> is a map of the input's metadata. The <input_id> must be a unique identifier within the inputs object. The <input_id> must start with a letter or _ and contain only alphanumeric characters, -, or _.",
1474-
"type": "object",
1475-
"properties": {
1476-
"description": {
1477-
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription",
1478-
"description": "A string description of the input parameter.",
1479-
"type": "string"
1480-
},
1481-
"deprecationMessage": {
1482-
"description": "A string shown to users using the deprecated input.",
1483-
"type": "string"
1484-
},
1485-
"required": {
1486-
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired",
1487-
"description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.",
1488-
"type": "boolean"
1489-
},
1490-
"default": {
1491-
"$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault",
1492-
"description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file."
1493-
},
1494-
"type": {
1495-
"$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype",
1496-
"description": "A string representing the type of the input.",
1497-
"type": "string",
1498-
"enum": [
1499-
"string",
1500-
"choice",
1501-
"boolean",
1502-
"number",
1503-
"environment"
1504-
]
1505-
},
1506-
"options": {
1507-
"$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows",
1508-
"description": "The options of the dropdown list, if the type is a choice.",
1509-
"type": "array",
1510-
"items": {
1511-
"type": "string"
1512-
},
1513-
"minItems": 1
1514-
}
1515-
},
1516-
"allOf": [
1517-
{
1518-
"if": {
1519-
"properties": {
1520-
"type": {
1521-
"const": "string"
1522-
}
1523-
},
1524-
"required": ["type"]
1525-
},
1526-
"then": {
1527-
"properties": {
1528-
"default": {
1529-
"type": "string"
1530-
}
1531-
}
1532-
}
1533-
},
1534-
{
1535-
"if": {
1536-
"properties": {
1537-
"type": {
1538-
"const": "boolean"
1539-
}
1540-
},
1541-
"required": ["type"]
1542-
},
1543-
"then": {
1544-
"properties": {
1545-
"default": {
1546-
"type": "boolean"
1547-
}
1548-
}
1549-
}
1550-
},
1551-
{
1552-
"if": {
1553-
"properties": {
1554-
"type": {
1555-
"const": "number"
1556-
}
1557-
},
1558-
"required": ["type"]
1559-
},
1560-
"then": {
1561-
"properties": {
1562-
"default": {
1563-
"type": "number"
1564-
}
1565-
}
1566-
}
1567-
},
1568-
{
1569-
"if": {
1570-
"properties": {
1571-
"type": {
1572-
"const": "environment"
1573-
}
1574-
},
1575-
"required": ["type"]
1576-
},
1577-
"then": {
1578-
"properties": {
1579-
"default": {
1580-
"type": "string"
1581-
}
1582-
}
1583-
}
1584-
},
1585-
{
1586-
"if": {
1587-
"properties": {
1588-
"type": {
1589-
"const": "choice"
1590-
}
1591-
},
1592-
"required": ["type"]
1593-
},
1594-
"then": {
1595-
"required": ["options"]
1596-
}
1597-
}
1598-
],
1599-
"required": ["description"],
1600-
"additionalProperties": false
1597+
"$ref": "#/definitions/workflowDispatchInput"
16011598
}
16021599
},
16031600
"additionalProperties": false

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

+30
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,23 @@
12841284
"title": "MergeProtectionRulesModel",
12851285
"type": "array"
12861286
},
1287+
"MergeProtectionsModel": {
1288+
"additionalProperties": false,
1289+
"properties": {
1290+
"reporting_method": {
1291+
"default": "check-runs",
1292+
"description": "The merge protection reporting method",
1293+
"enum": [
1294+
"check-runs",
1295+
"deployments"
1296+
],
1297+
"title": "Reporting Method",
1298+
"type": "string"
1299+
}
1300+
},
1301+
"title": "MergeProtectionsModel",
1302+
"type": "object"
1303+
},
12871304
"MergeQueueModel": {
12881305
"additionalProperties": false,
12891306
"properties": {
@@ -2615,6 +2632,11 @@
26152632
"title": "Update Bot Account"
26162633
},
26172634
"disallow_checks_interruption_from_queues": {
2635+
"configuration_deprecated_attribute": {
2636+
"deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/",
2637+
"deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/"
2638+
},
2639+
"deprecated": true,
26182640
"items": {
26192641
"type": "string"
26202642
},
@@ -2847,6 +2869,11 @@
28472869
"title": "Update Bot Account"
28482870
},
28492871
"disallow_checks_interruption_from_queues": {
2872+
"configuration_deprecated_attribute": {
2873+
"deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/",
2874+
"deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/"
2875+
},
2876+
"deprecated": true,
28502877
"items": {
28512878
"type": "string"
28522879
},
@@ -3163,6 +3190,9 @@
31633190
},
31643191
"merge_queue": {
31653192
"$ref": "#/$defs/MergeQueueModel"
3193+
},
3194+
"merge_protections_settings": {
3195+
"$ref": "#/$defs/MergeProtectionsModel"
31663196
}
31673197
},
31683198
"$schema": "https://json-schema.org/draft/2020-12/schema",

‎src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cd652ef789d666c07f2fd5e6236ae2a491e11506addb42466f6c9911fa997955
1+
07533ac8ed37edd4ee71bc39daecd03c5ee88619732e7dc24cf7627a272d9cd1

‎src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a4e9db7fb53cb6dd91b3c71449b98f42d8e778ebf6cf1bd1b8c3224f3dce8bee
1+
287c4e34b14a32340166605a8b98846409f9177234d1f308263834a31b7692e7

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a5a886702e1102c86a72bcc676f5da57d697718a91f7ab529a9ac17def47c6b7
1+
acebe3821816bbf8e9dafbd15146dfce5a12f9c49075e6132cb56b51f47a53ec

‎src/check_jsonschema/catalog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def _githubusercontent_url(owner: str, repo: str, ref: str, path: str) -> str:
182182
"url": _githubusercontent_url(
183183
"readthedocs",
184184
"readthedocs.org",
185-
"master",
185+
"main",
186186
"readthedocs/rtd_tests/fixtures/spec/v2/schema.json",
187187
),
188188
"hook_config": {

0 commit comments

Comments
 (0)