diff options
| author | Michael Kubacki <michael.kubacki@microsoft.com> | 2024-08-19 18:46:51 -0400 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-26 23:43:00 +0000 |
| commit | f3040bed3cb43ddad2e5d2fd54c6140f23c7d763 (patch) | |
| tree | a81602cdd8784b36ea7fbe9582a41bebab65eee6 /.mergify | |
| parent | 1cc0fae8d9e2681fc6a33e5602ce8368809f9465 (diff) | |
| download | edk2-f3040bed3cb43ddad2e5d2fd54c6140f23c7d763.tar.gz | |
.mergify: Fix pull_request_rules deprecation
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>
Diffstat (limited to '.mergify')
| -rw-r--r-- | .mergify/config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.mergify/config.yml b/.mergify/config.yml index 3471896a34..fd77b1707b 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -26,9 +26,10 @@ queue_rules:
- name: default
- conditions:
+ queue_conditions:
- base~=(^main|^master|^stable/)
- label=push
+ merge_method: rebase
pull_request_rules:
- name: Automatically merge a PR when all required checks pass and 'push' label is present
@@ -37,7 +38,6 @@ pull_request_rules: - label=push
actions:
queue:
- method: rebase
name: default
- name: Post a comment on a PR that can not be merged due to a merge conflict
|