From 3412c1cc252d4140e608f71aacfe1a0f211c7a67 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 17:29:11 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

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

diff --git a/.mergify.yml b/.mergify.yml
index bbb21b06..68d1594a 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,29 +1,29 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=master
-      - status-success="validate commits"
-      - status-success="make check"
-      - status-success="make linkcheck"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - "approved-reviews-by=@flux-framework/core"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~="^\[*(WIP|wip)"
-      
-pull_request_rules:
-  - name: rebase and merge when passing all checks
-    conditions:
+    merge_conditions:
       - base=master
+      - status-success="validate commits"
+      - status-success="make check"
+      - status-success="make linkcheck"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - "approved-reviews-by=@flux-framework/core"
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~="^\[*(WIP|wip)"
+    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