From 5f16ac40b839767da63156434232343db3fa65c1 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 08:50:21 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6c703b8ce61..28dbdac69ae 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,22 +1,18 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=master
       - label=S:automerge
-
-pull_request_rules:
-  - name: Automerge to master
-    conditions:
+    merge_conditions:
       - base=master
       - label=S:automerge
-    actions:
-      queue:
-        method: squash
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
 
-          {{ body }}
+pull_request_rules:
   - name: backport patches to v0.34.x branch
     conditions:
       - base=master
@@ -41,3 +37,7 @@ pull_request_rules:
       backport:
         branches:
           - v0.36.x
+  - name: Automerge to master
+    conditions: []
+    actions:
+      queue: