ci(mergify): upgrade configuration to current format

Dwolla · Nov 27, 2024 · b3b14be · b3b14be
1 parent 82eb3c0
commit b3b14be
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,10 +1,17 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - author=dwolla-oss-scala-steward[bot]
+      - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@11)
+      - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11)
+    merge_conditions:
       - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@8)
       - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@11)
       - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8)
       - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11)
+    merge_method: squash
 
 pull_request_rules:
   - name: assign and label scala-steward's PRs
@@ -21,13 +28,6 @@ pull_request_rules:
     actions:
       update:
   - name: merge scala-steward's PRs
-    conditions:
-      - author=dwolla-oss-scala-steward[bot]
-      - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@8)
-      - status-success=Build and Test (ubuntu-latest, 2.13.9, temurin@11)
-      - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8)
-      - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11)
+    conditions: []
     actions:
       queue:
-        method: squash
-        name: default