From 04b6e283468bd11a7705996c2021f3774a5f19cd Mon Sep 17 00:00:00 2001 From: sirosen <1300022+sirosen@users.noreply.github.com> Date: Sun, 5 Jan 2025 04:25:54 +0000 Subject: [PATCH 1/2] [vendor-schemas] automated update --- CHANGELOG.rst | 2 +- .../builtin_schemas/vendor/buildkite.json | 4 +--- .../builtin_schemas/vendor/dependabot.json | 1 + .../builtin_schemas/vendor/mergify.json | 18 ++++++------------ .../builtin_schemas/vendor/readthedocs.json | 6 ++++-- .../builtin_schemas/vendor/renovate.json | 2 +- .../vendor/sha256/buildkite.sha256 | 2 +- .../vendor/sha256/dependabot.sha256 | 2 +- .../vendor/sha256/mergify.sha256 | 2 +- .../vendor/sha256/readthedocs.sha256 | 2 +- .../vendor/sha256/renovate.sha256 | 2 +- .../vendor/sha256/taskfile.sha256 | 2 +- .../builtin_schemas/vendor/taskfile.json | 7 +++++++ 13 files changed, 27 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dc23d3d6f..d04ccde62 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ Unreleased ---------- .. vendor-insert-here -- Update vendored schemas (2024-12-22) +- Update vendored schemas (2025-01-05) - Drop support for Python 3.8 - Rename ``--format-regex`` to ``--regex-variant`` and convert ``--format-regex`` to a deprecated alias. diff --git a/src/check_jsonschema/builtin_schemas/vendor/buildkite.json b/src/check_jsonschema/builtin_schemas/vendor/buildkite.json index 4146410ae..f2d23824c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/buildkite.json +++ b/src/check_jsonschema/builtin_schemas/vendor/buildkite.json @@ -1263,9 +1263,7 @@ "$ref": "#/definitions/skip" }, "soft_fail": { - "enum": [true, false, "true", "false"], - "description": "The conditions for marking the step as a soft-fail.", - "default": false + "$ref": "#/definitions/softFail" } }, "additionalProperties": false, diff --git a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json index 0923e33ba..c860ceac1 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json +++ b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json @@ -652,6 +652,7 @@ "composer", "devcontainers", "docker", + "dotnet-sdk", "elm", "gitsubmodule", "github-actions", diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index 67ecce7d2..8102caae7 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -2529,7 +2529,9 @@ }, "queue_branch_prefix": { "default": "mergify/merge-queue/", - "title": "Queue Branch Prefix", + "description": "Prefix for the merge queue branch name", + "format": "template", + "title": "Template", "type": "string" }, "allow_queue_branch_edit": { @@ -2642,11 +2644,6 @@ "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. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "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. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, "items": { "type": "string" }, @@ -2790,7 +2787,9 @@ }, "queue_branch_prefix": { "default": "mergify/merge-queue/", - "title": "Queue Branch Prefix", + "description": "Prefix for the merge queue branch name", + "format": "template", + "title": "Template", "type": "string" }, "allow_queue_branch_edit": { @@ -2903,11 +2902,6 @@ "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. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "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. This option has been replaced by `allow_checks_interruption` at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, "items": { "type": "string" }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json b/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json index 716b04e55..f11436c0c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json +++ b/src/check_jsonschema/builtin_schemas/vendor/readthedocs.json @@ -337,7 +337,8 @@ "default": false } }, - "additionalProperties": false + "additionalProperties": false, + "required": ["configuration"] }, "mkdocs": { "title": "mkdocs", @@ -356,7 +357,8 @@ "default": false } }, - "additionalProperties": false + "additionalProperties": false, + "required": ["configuration"] }, "submodules": { "title": "Submodules", diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 6da585c92..12a9d4bed 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -1072,7 +1072,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:13.5.0" + "default": "ghcr.io/containerbase/sidecar:13.5.7" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 index 35d950d25..532cf89f0 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 @@ -1 +1 @@ -62c52d12f959a2f919ec4efc1352ef175781d8ba81f8cc7feb19564b391700d8 \ No newline at end of file +761ceff545736b65fabe577b8e7d06ceb5baa9d339f8faa0192cd3c3d85d5a11 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 index 8324011d9..d75fcffb8 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 @@ -1 +1 @@ -235f4185dbf74d5fd7027c149a859701246f7880ba400f6a57e3617b5f51a36e \ No newline at end of file +bb1d6e2ddccbdc94a4ea84617fa89af57f6938b9ef72095583a31b6914c8ae1c \ 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 b2a0dea90..cc8b7b085 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -9ee866491e48c35a24339f78f59d3edbc5638101d2f0645004853eaf9c297319 \ No newline at end of file +79c4574e3befd849df3cc5c18a8333d028c5c306de267555e8643f9ccaa8fa33 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 index 1a3701294..5b21ceb74 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 @@ -1 +1 @@ -bee0e6132fa6026c47200ba811090b6cf52fe540a7e5eace0772cfb75fdc6a4a \ No newline at end of file +77278afd8de08da09665e12d305c9c23721e940d3869355eb6bda2a024a2f0d7 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 index 03036e121..cf1f82d20 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -7edf0b8bfe96a7e921f60ae85fa9f47c873c92b6217ab900cc63c250853349f7 \ No newline at end of file +8d48a94573c61cec0577a5a4e5b55811129751ad28a0cac81578ab5842759f9c \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 index 242286970..ba28a1442 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 @@ -1 +1 @@ -293685aaf876ab9eea331dce2448ff8347376dacc2d477b36dc24a8617e73ac3 \ No newline at end of file +e991e9f53f0615caf16c0777d9f38e5aa8243407283205110f3514d1375097ff \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json index 9eea456a8..da25a209f 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json +++ b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json @@ -653,6 +653,13 @@ "type": "string" } }, + "excludes": { + "description": "A list of tasks to be excluded from inclusion.", + "type": "array", + "items": { + "type": "string" + } + }, "vars": { "description": "A set of variables to apply to the included Taskfile.", "$ref": "#/definitions/vars" From 377786ede4ab91b4277a43500ea7beb429bce681 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Tue, 7 Jan 2025 22:27:04 -0600 Subject: [PATCH 2/2] Update vendored schemas (2025-01-07) --- CHANGELOG.rst | 3 ++- src/check_jsonschema/builtin_schemas/vendor/mergify.json | 3 ++- src/check_jsonschema/builtin_schemas/vendor/renovate.json | 2 +- .../builtin_schemas/vendor/sha256/mergify.sha256 | 2 +- .../builtin_schemas/vendor/sha256/renovate.sha256 | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d04ccde62..2bfd178d3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,8 @@ Unreleased ---------- .. vendor-insert-here -- Update vendored schemas (2025-01-05) + +- Update vendored schemas (2025-01-07) - Drop support for Python 3.8 - Rename ``--format-regex`` to ``--regex-variant`` and convert ``--format-regex`` to a deprecated alias. diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index 8102caae7..3745006d4 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -1688,7 +1688,8 @@ "DRAFT_PULL_REQUEST_CHANGED", "PULL_REQUEST_UPDATED", "MERGE_QUEUE_RESET", - "INCOMPATIBILITY_WITH_BRANCH_PROTECTIONS" + "INCOMPATIBILITY_WITH_BRANCH_PROTECTIONS", + "PR_MANUALLY_MERGED" ], "type": "string" }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 12a9d4bed..dd5814cd7 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -1072,7 +1072,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:13.5.7" + "default": "ghcr.io/containerbase/sidecar:13.5.8" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 index cc8b7b085..2b05ccd37 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -79c4574e3befd849df3cc5c18a8333d028c5c306de267555e8643f9ccaa8fa33 \ No newline at end of file +d2afb9ba1f220ce421931d064c71a366e4e2c96f08bcb59e26d6b0c554cf21ba \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 index cf1f82d20..463e2b100 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -8d48a94573c61cec0577a5a4e5b55811129751ad28a0cac81578ab5842759f9c \ No newline at end of file +881689db799388cfc85d84bd89f565d69dd0869c0dfc60b83096252216980999 \ No newline at end of file