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

---
 .mergify.yml | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index c5e9be00a..0cdbaf1c5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,23 +1,17 @@
 queue_rules:
-  - name: default
-    conditions:
+  - name: duplicated default from Automatic merge on approval
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+    merge_conditions:
       - check-success=test (8, 2.13.7)
       - check-success=test (11, 2.13.7)
       - check-success=testPY (11, 2.13.7, 3.5)
       - check-success=testJS (11, 2.13.7)
       - check-success=testWithCoverageReport (8)
       - check-success=buildWithGraal (2.13.7)
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - "#approved-reviews-by>=1"
-    actions:
-      queue:
-        method: merge
-        name: default
-  - name: merge scala-steward's PRs
-    conditions:
+    merge_method: merge
+  - name: duplicated default from merge scala-steward's PRs
+    queue_conditions:
       - author=scala-steward
       - check-success=test (8, 2.13.7)
       - check-success=test (11, 2.13.7)
@@ -25,7 +19,25 @@ pull_request_rules:
       - check-success=testJS (11, 2.13.7)
       - check-success=testWithCoverageReport (8)
       - check-success=buildWithGraal (2.13.7)
+    merge_conditions:
+      - check-success=test (8, 2.13.7)
+      - check-success=test (11, 2.13.7)
+      - check-success=testPY (11, 2.13.7, 3.5)
+      - check-success=testJS (11, 2.13.7)
+      - check-success=testWithCoverageReport (8)
+      - check-success=buildWithGraal (2.13.7)
+    merge_method: squash
+  - name: default
+    conditions:
+      - check-success=test (8, 2.13.7)
+      - check-success=test (11, 2.13.7)
+      - check-success=testPY (11, 2.13.7, 3.5)
+      - check-success=testJS (11, 2.13.7)
+      - check-success=testWithCoverageReport (8)
+      - check-success=buildWithGraal (2.13.7)
+
+pull_request_rules:
+  - name: Automatic merge on approval + merge scala-steward's PRs
+    conditions: []
     actions:
       queue:
-        method: squash
-        name: default
\ No newline at end of file