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

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

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 15e2dd2653..c0b76f7eec 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -2,26 +2,19 @@ queue_rules:
   - name: default
     # Mergify always respects the branch protection settings
     # so we can left empty mergify own ones
-    conditions: []
-
-pull_request_rules:
-  - name: Automatically merge pull requests
-    conditions:
+    queue_conditions:
       - label=merge me
       - '#approved-reviews-by>=1'
-    actions:
-      queue:
-        method: squash
-        name: default
-  # The queue action automatically updates PRs that
-  # have entered the queue, but in order to do that
-  # they must have passed CI. Since our CI is a bit
-  # flaky, PRs can fail to get in, which then means
-  # they don't get updated, which is extra annoying.
-  # This just adds the updating as an independent 
-  # step.
+    merge_conditions: []
+    merge_method: squash
+
+pull_request_rules:
   - name: Automatically update pull requests
     conditions:
       - label=merge me
     actions:
       update:
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: