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

---
 .mergify.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index eddac7d3..3bd2bf77 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,21 +2,25 @@
 
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - -label~=(do-not-merge)
+      - status-success=build
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)
       - status-success=build
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+
 pull_request_rules:
   - name: Automatic merge on approval and successful build
     actions:
       delete_head_branch: {}
       queue:
-        method: squash
-        name: default
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
     conditions:
       - "#approved-reviews-by>=1"
       - -label~=(do-not-merge)