Merge pull request #101 from flux-framework/mergify/configuration-dep…

…recated-update ci(mergify): upgrade configuration to current format
flux-framework · Dec 9, 2024 · 19933ad · 19933ad
2 parents d782a00 + 6b96bf7
commit 19933ad
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,27 +1,26 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=main
       - label="merge-when-passing"
       - label!="work-in-progress"
       - -title~=^\[*[Ww][Ii][Pp]
       - "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"
       - -title~=^\[*[Ww][Ii][Pp]
       - "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
-