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

---
 .github/mergify.yml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index de362dd..c76507d 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,29 +1,16 @@
+
 pull_request_rules:
   # rebase+merge strategy
-  - actions:
+  - name: refactored queue action rule
+    actions:
       queue:
-        name: default
-        # Merge into master with a merge commit
-        method: merge
-        # Update the pr branch with rebase, so the history is clean
-        update_method: rebase
-    name: Put pull requests in the rebase+merge queue
-    conditions:
+queue_rules:
+  - name: default
+    queue_conditions:
       - label=merge me
       - '#approved-reviews-by>=1'
-  # merge+squash strategy
-  - actions:
-      queue:
-        name: default
-        method: squash
-        # both update methods get absorbed by the squash, so we use the most
-        # reliable
-        update_method: merge
-    name: Put pull requests in the squash+merge queue
-    conditions:
       - label=squash+merge me
       - '#approved-reviews-by>=1'
-
-queue_rules:
-  - name: default
     conditions: []
+    merge_method: squash
+    update_method: merge