From bfdc9a03c9bee434e58511477442da7c2ad5f17d Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:11:59 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .github/mergify.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index d8bb1105e59..55f367b0b62 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,5 +1,9 @@
 queue_rules:
   - name: default
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - base=main
+      - label=automerge
     commit_message_template: |
       {{ title }} (#{{ number }})
       {{ body }}
@@ -7,17 +11,9 @@ queue_rules:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
+    merge_method: squash
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
-    conditions:
-      - "#approved-reviews-by>=1"
-      - base=main
-      - label=automerge
-    actions:
-      queue:
-        name: default
-        merge_method: squash
   - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main
@@ -130,3 +126,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v9.0.x
+  - name: automerge to main with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue: