tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

.mergify: Fix pull_request_rules deprecation

Browse Source 
The following message is visible on mergify runs:

"The configuration uses the deprecated merge_method attribute of the
queue action in one or more pull_request_rules. It must now be used
under the queue_rules configuration."

With the following warning:

"A brownout is planned on August 26th, 2024.
This option will be removed on September 23rd, 2024."

This change updates the configuration file to comply with the new
format.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
This commit is contained in:
Michael Kubacki 2024-08-19 18:46:51 -04:00 committed by mergify[bot]
parent 1cc0fae8d9
commit f3040bed3c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mergify/config.yml
View File

@ -26,9 +26,10 @@
queue_rules: queue_rules:
- name: default - name: default
conditions: queue_conditions:
- base~=(^main|^master|^stable/) - base~=(^main|^master|^stable/)
- label=push - label=push
merge_method: rebase
pull_request_rules: pull_request_rules:
- name: Automatically merge a PR when all required checks pass and 'push' label is present - name: Automatically merge a PR when all required checks pass and 'push' label is present
@ -37,7 +38,6 @@ pull_request_rules:
- label=push - label=push
actions: actions:
queue: queue:
method: rebase
name: default name: default
- name: Post a comment on a PR that can not be merged due to a merge conflict - name: Post a comment on a PR that can not be merged due to a merge conflict