From 7bc47ff5c4474ab6dc8ced9b664f6454fa4b3d86 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:06:42 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index bed5b35..28abd3d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,20 +1,18 @@
 queue_rules:
   - name: default
+    queue_conditions:
+      - base = main
+      - "#approved-reviews-by>=1"
+      - -label~=(do-not-merge)
+      - status-success=auto-approve
+    merge_conditions: []
     commit_message_template: |-
       {{ title }} (#{{ number }})
 
       {{ body }}
     merge_method: squash
+
 pull_request_rules:
-  - name: put PRs in queue (squash)
-    conditions:
-      - base = main
-      - "#approved-reviews-by>=1"
-      - -label~=(do-not-merge)
-      - status-success=auto-approve
-    actions:
-      queue:
-        merge_method: squash
   - name: Label core contributions
     actions:
       label:
@@ -31,5 +29,9 @@ pull_request_rules:
     conditions:
       - label=contribution/core
       - label!=auto-merge
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue:
 merge_queue:
   max_parallel_checks: 1