From 601218fcef32bdfcdf61a49fcd4b25d49f1258c6 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Fri, 28 Feb 2025 15:53:28 -0600 Subject: [PATCH] Update vendored schemas And update RTD schema to use 'main'. The main branch for the RTD repo was renamed from 'master'. --- CHANGELOG.rst | 3 +- .../builtin_schemas/vendor/circle-ci.json | 9 +- .../vendor/github-workflows.json | 255 +++++++++--------- .../builtin_schemas/vendor/mergify.json | 30 +++ .../vendor/sha256/circle-ci.sha256 | 2 +- .../vendor/sha256/github-workflows.sha256 | 2 +- .../vendor/sha256/mergify.sha256 | 2 +- src/check_jsonschema/catalog.py | 2 +- 8 files changed, 170 insertions(+), 135 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dba7278e0..d3ffb2fc3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,8 @@ Unreleased .. vendor-insert-here -- Update vendored schemas: renovate, taskfile (2025-02-23) +- Update vendored schemas: circle-ci, github-workflows, mergify, renovate, taskfile + (2025-02-28) 0.31.2 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json index 2f54c3f0d..01e68da80 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json @@ -1321,6 +1321,8 @@ "ubuntu-2404:2024.05.1", "ubuntu-2404:current", "ubuntu-2404:edge", + "android:2024.11.1", + "android:2024.07.1", "android:2024.04.1", "android:2024.01.1", "android:2023.11.1", @@ -1425,7 +1427,12 @@ "macOSResourceClass": { "description": "Amount of CPU and RAM allocated for each job. View [available resource classes](https://circleci.com/docs/configuration-reference/#macos-execution-environment).", "type": "string", - "enum": ["macos.m1.medium.gen1", "macos.m1.large.gen1"] + "enum": [ + "macos.m1.medium.gen1", + "macos.m1.large.gen1", + "m2pro.medium", + "m2pro.large" + ] }, "xcodeVersion": { "description": "The version of Xcode to use. View [available versions](https://circleci.com/developer/machine/image/xcode)", diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json index de4dcd891..d1dbfe1fe 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json +++ b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json @@ -843,6 +843,131 @@ }, "required": ["runs-on"], "additionalProperties": false + }, + "workflowDispatchInput": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id", + "description": "A string identifier to associate with the input. The value of is a map of the input's metadata. The must be a unique identifier within the inputs object. The must start with a letter or _ and contain only alphanumeric characters, -, or _.", + "type": "object", + "properties": { + "description": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription", + "description": "A string description of the input parameter.", + "type": "string" + }, + "deprecationMessage": { + "description": "A string shown to users using the deprecated input.", + "type": "string" + }, + "required": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired", + "description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.", + "type": "boolean" + }, + "default": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault", + "description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file." + }, + "type": { + "$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype", + "description": "A string representing the type of the input.", + "type": "string", + "enum": ["string", "choice", "boolean", "number", "environment"] + }, + "options": { + "$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows", + "description": "The options of the dropdown list, if the type is a choice.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 1 + } + }, + "allOf": [ + { + "if": { + "properties": { + "type": { + "const": "string" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "string" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "boolean" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "boolean" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "number" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "number" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "environment" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "string" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "choice" + } + }, + "required": ["type"] + }, + "then": { + "required": ["options"] + } + } + ], + "required": ["description"], + "additionalProperties": false } }, "properties": { @@ -1469,135 +1594,7 @@ "type": "object", "patternProperties": { "^[_a-zA-Z][a-zA-Z0-9_-]*$": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id", - "description": "A string identifier to associate with the input. The value of is a map of the input's metadata. The must be a unique identifier within the inputs object. The must start with a letter or _ and contain only alphanumeric characters, -, or _.", - "type": "object", - "properties": { - "description": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription", - "description": "A string description of the input parameter.", - "type": "string" - }, - "deprecationMessage": { - "description": "A string shown to users using the deprecated input.", - "type": "string" - }, - "required": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired", - "description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.", - "type": "boolean" - }, - "default": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault", - "description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file." - }, - "type": { - "$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype", - "description": "A string representing the type of the input.", - "type": "string", - "enum": [ - "string", - "choice", - "boolean", - "number", - "environment" - ] - }, - "options": { - "$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows", - "description": "The options of the dropdown list, if the type is a choice.", - "type": "array", - "items": { - "type": "string" - }, - "minItems": 1 - } - }, - "allOf": [ - { - "if": { - "properties": { - "type": { - "const": "string" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "string" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "boolean" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "boolean" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "number" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "number" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "environment" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "string" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "choice" - } - }, - "required": ["type"] - }, - "then": { - "required": ["options"] - } - } - ], - "required": ["description"], - "additionalProperties": false + "$ref": "#/definitions/workflowDispatchInput" } }, "additionalProperties": false diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index f3d423400..26d8290db 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -1284,6 +1284,23 @@ "title": "MergeProtectionRulesModel", "type": "array" }, + "MergeProtectionsModel": { + "additionalProperties": false, + "properties": { + "reporting_method": { + "default": "check-runs", + "description": "The merge protection reporting method", + "enum": [ + "check-runs", + "deployments" + ], + "title": "Reporting Method", + "type": "string" + } + }, + "title": "MergeProtectionsModel", + "type": "object" + }, "MergeQueueModel": { "additionalProperties": false, "properties": { @@ -2615,6 +2632,11 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { + "configuration_deprecated_attribute": { + "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/", + "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/" + }, + "deprecated": true, "items": { "type": "string" }, @@ -2847,6 +2869,11 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { + "configuration_deprecated_attribute": { + "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/", + "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/" + }, + "deprecated": true, "items": { "type": "string" }, @@ -3163,6 +3190,9 @@ }, "merge_queue": { "$ref": "#/$defs/MergeQueueModel" + }, + "merge_protections_settings": { + "$ref": "#/$defs/MergeProtectionsModel" } }, "$schema": "https://json-schema.org/draft/2020-12/schema", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 index 557aa8af6..32be41c77 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 @@ -1 +1 @@ -cd652ef789d666c07f2fd5e6236ae2a491e11506addb42466f6c9911fa997955 \ No newline at end of file +07533ac8ed37edd4ee71bc39daecd03c5ee88619732e7dc24cf7627a272d9cd1 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 index 9ffe1c1eb..ab9433a9c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 @@ -1 +1 @@ -a4e9db7fb53cb6dd91b3c71449b98f42d8e778ebf6cf1bd1b8c3224f3dce8bee \ No newline at end of file +287c4e34b14a32340166605a8b98846409f9177234d1f308263834a31b7692e7 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 index e30957b15..da1d9f828 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -a5a886702e1102c86a72bcc676f5da57d697718a91f7ab529a9ac17def47c6b7 \ No newline at end of file +acebe3821816bbf8e9dafbd15146dfce5a12f9c49075e6132cb56b51f47a53ec \ No newline at end of file diff --git a/src/check_jsonschema/catalog.py b/src/check_jsonschema/catalog.py index 0bedd57a1..dcbcf3c58 100644 --- a/src/check_jsonschema/catalog.py +++ b/src/check_jsonschema/catalog.py @@ -182,7 +182,7 @@ def _githubusercontent_url(owner: str, repo: str, ref: str, path: str) -> str: "url": _githubusercontent_url( "readthedocs", "readthedocs.org", - "master", + "main", "readthedocs/rtd_tests/fixtures/spec/v2/schema.json", ), "hook_config": {