Skip to content

Commit f6257ae

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: [1] !! 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: [1] ref: https://docs.mergify.com/workflow/actions/queue/#parameters [1] https://docs.mergify.com/configuration/file-format/#queue-rules Signed-off-by: Anoop C S <[email protected]>
1 parent f6a4c5b commit f6257ae

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/mergify.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
---
2-
defaults:
3-
actions:
4-
queue:
5-
name: default
6-
method: rebase
7-
update_method: rebase
8-
9-
102
# each test should be listed separately, do not use regular expressions:
113
# https://docs.mergify.io/conditions.html#validating-all-status-check
124
# TODO: Use mergify's recently added 'shared configuration support'
@@ -41,6 +33,8 @@ queue_rules:
4133
- check-success=test-ad-server-kubernetes (nightly, centos, amd64)
4234
- check-success=test-ad-server-kubernetes (nightly, fedora, amd64)
4335
- check-success=dpulls
36+
merge_method: rebase
37+
update_method: rebase
4438

4539

4640
pull_request_rules:

0 commit comments

Comments
 (0)