From 6b96bf75a2b9bbff46efa1455394fec9d7e52500 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:43:55 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index d7ab154..e2fd7a6 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,6 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=main
       - label="merge-when-passing"
       - label!="work-in-progress"
@@ -8,10 +8,7 @@ queue_rules:
       - "approved-reviews-by=@flux-framework/core"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
-
-pull_request_rules:
-  - name: rebase and merge when passing all checks
-    conditions:
+    merge_conditions:
       - base=main
       - label="merge-when-passing"
       - label!="work-in-progress"
@@ -19,9 +16,11 @@ pull_request_rules:
       - "approved-reviews-by=@flux-framework/core"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
+    update_method: rebase
+    merge_method: merge
+
+pull_request_rules:
+  - name: rebase and merge when passing all checks
+    conditions: []
     actions:
       queue:
-        name: default
-        method: merge
-        update_method: rebase
-