ci: mergify updates (#7439)

cosmos · Oct 10, 2024 · 10175b9 · 10175b9
1 parent 0677a92
commit 10175b9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,6 +1,9 @@
 queue_rules:
   - name: default
-    conditions:
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
@@ -14,10 +17,7 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+        merge_method: squash
   - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main