Skip to content

Commit 54071ff

Browse files
sirosengithub-actions[bot]
authored andcommitted
[vendor-schemas] automated update
1 parent fcace24 commit 54071ff

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Unreleased
1010

1111
.. vendor-insert-here
1212
13+
- Update vendored schemas: mergify, renovate (2025-09-21)
14+
1315
0.34.0
1416
------
1517

src/check_jsonschema/builtin_schemas/vendor/mergify.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,7 @@
24932493
}
24942494
],
24952495
"default": null,
2496-
"description": "Method to use to update the pull request with its base branch when the check is done in place.\nPossible values:\n\n- `merge` to merge the base branch into the pull request.\n- `rebase` to rebase the pull request against its base branch.\n\nThis option overrides the value defined in the queue rules section of the configuration.\nThe default is rebase when the `merge_method` is `fast-forward`.",
2496+
"description": "Method to use to update the pull request with its base branch when the check is done in place.\nPossible values:\n\n- `merge` to merge the base branch into the pull request.\n- `rebase` to rebase the pull request against its base branch.\n\nWhen `null`, defaults to `merge` except if `merge_method` is `fast-forward` then it defaults to `rebase.",
24972497
"title": "Update Method"
24982498
},
24992499
"commit_message_template": {
@@ -2710,7 +2710,7 @@
27102710
}
27112711
],
27122712
"default": null,
2713-
"description": "Method to use to update the pull request with its base branch when the check is done in place.\nPossible values:\n\n- `merge` to merge the base branch into the pull request.\n- `rebase` to rebase the pull request against its base branch.\n\nThis option overrides the value defined in the queue rules section of the configuration.\nThe default is rebase when the `merge_method` is `fast-forward`.",
2713+
"description": "Method to use to update the pull request with its base branch when the check is done in place.\nPossible values:\n\n- `merge` to merge the base branch into the pull request.\n- `rebase` to rebase the pull request against its base branch.\n\nWhen `null`, defaults to `merge` except if `merge_method` is `fast-forward` then it defaults to `rebase.",
27142714
"title": "Update Method"
27152715
},
27162716
"commit_message_template": {

src/check_jsonschema/builtin_schemas/vendor/renovate.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,8 +1829,7 @@
18291829
"/(^|/)conanfile\\.(txt|py)$/"
18301830
],
18311831
"datasource": "conan",
1832-
"versioning": "conan",
1833-
"enabled": false
1832+
"versioning": "conan"
18341833
},
18351834
"$ref": "#",
18361835
"items": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
53a015aa4cfc71bd6b12c0c804892e570644f4e0e845da386d3ce994831b2ff3
1+
cb7620d20a9ed259ea93d56c39f32e959a2e131007d77c9d7c7d122e628f86fb
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9e5c3db1ab63ffe53211873641e2b428281b13cba6843cc7f80a7f7789b1ef1a
1+
01adde2ec04ee77874f1471c60e3946dbbbfd6c480b152e09d23d224c7afada7

0 commit comments

Comments
 (0)