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]>
samba-in-kubernetes · Aug 21, 2024 · 26b0f09 · 26b0f09
1 parent 1b72854
commit 26b0f09
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,12 +1,4 @@
 ---
-defaults:
-  actions:
-    queue:
-      name: default
-      method: rebase
-      update_method: rebase
-
-
 # each test should be listed separately, do not use regular expressions:
 # https://docs.mergify.io/conditions.html#validating-all-status-check
 # TODO: Use mergify's recently added 'shared configuration support'
@@ -19,6 +11,8 @@ queue_rules:
       - check-success=test (fedora-40)
       - check-success=test (centos-stream9)
       - check-success=dpulls
+    merge_method: rebase
+    update_method: rebase
 
 
 pull_request_rules: