From ecce935f654fa116002d185871a72518b82d1a51 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:55:24 +0100
Subject: [PATCH] ci(mergify): upgrade configuration to current format (#4420)

Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
---
 .github/mergify.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 15d82166be..1444a55b3d 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,20 +1,16 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>1"
+      - base=main
+    merge_conditions:
       - "#approved-reviews-by>1"
+    merge_method: squash
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
-    conditions:
-      - "#approved-reviews-by>1"
-      - base=main
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
   - name: backport patches to v28.x.y branch
     conditions:
       - base=main
@@ -31,3 +27,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v29.x.y
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: