ci(mergify): upgrade configuration to current format

openforis · Nov 25, 2024 · 220a7fc · 220a7fc
1 parent fceeed9
commit 220a7fc
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,17 +1,13 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+    merge_conditions:
       - check-success=build
       - check-success=DeepScan
+    merge_method: squash
 
 pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - "#approved-reviews-by>=1"
-    actions:
-      queue:
-        method: squash
-        name: default
   - name: automatic branch update
     conditions:
       - -conflict # skip PRs with conflicts
@@ -23,3 +19,7 @@ pull_request_rules:
       - merged
     actions:
       delete_head_branch: {}
+  - name: Automatic merge on approval
+    conditions: []
+    actions:
+      queue: