Skip to content

Commit 7b57465

Browse files
anoopcs9mergify[bot]
authored andcommitted
github: Update mergify config to replace deprecated attributes
!! Action Required !! 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. A brownout is planned on August 26th, 2024. This option will be removed on September 23rd, 2024. For more information: https://docs.mergify.com/configuration/file-format/#queue-rules !! Action Required !! The configuration uses the deprecated update_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration. A brownout is planned on August 26th, 2024. This option will be removed on September 23rd, 2024. For more information: https://docs.mergify.com/configuration/file-format/#queue-rules ref: https://docs.mergify.com/workflow/actions/queue/#parameters Signed-off-by: Anoop C S <[email protected]>
1 parent fcfb1d4 commit 7b57465

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

.github/mergify.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
---
2-
defaults:
3-
actions:
4-
queue:
5-
name: default
6-
method: rebase
7-
update_method: rebase
8-
92
# each test should be listed separately, do not use regular expressions:
103
# https://docs.mergify.io/conditions.html#validating-all-status-check
114
# Until mergify allows us to have default conditions, we will need to
@@ -19,6 +12,8 @@ queue_rules:
1912
- check-success=test-suite (pacific)
2013
- check-success=test-suite (quincy)
2114
- check-success=test-suite (reef)
15+
merge_method: rebase
16+
update_method: rebase
2217

2318
pull_request_rules:
2419
# Clearing approvals after content changes

0 commit comments

Comments
 (0)