ci(mergify): upgrade configuration to current format

mitre-cyber-academy · Dec 16, 2024 · 4259e8e · 4259e8e
1 parent 8251ac4
commit 4259e8e
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,27 +1,26 @@
 queue_rules:
-  - name: default
-    conditions:
-      - check-success=Build
-
-pull_request_rules:
-  - name: automatic merge for master when reviewed and CI passes
-    conditions:
+  - name: duplicated default from automatic merge for master when reviewed and CI
+      passes
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - base=master
       - label=ready-to-merge
-    actions:
-        queue:
-          name: default
-          method: squash
-  - name: automatic merge for updates when CI passes
-    conditions:
+    merge_conditions:
+      - check-success=Build
+    merge_method: squash
+  - name: duplicated default from automatic merge for updates when CI passes
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - base=master
       - label=dependencies
-    actions:
-        queue:
-          name: default
-          method: squash
+    merge_conditions:
+      - check-success=Build
+    merge_method: squash
+  - name: default
+    conditions:
+      - check-success=Build
+
+pull_request_rules:
   - name: delete head branch after merge
     conditions:
       - merged
@@ -31,5 +30,10 @@ pull_request_rules:
     conditions:
       - conflict
     actions:
-        comment:
-          message: This pull request has conflict. Could you fix it @{{author}}?
+      comment:
+        message: This pull request has conflict. Could you fix it @{{author}}?
+  - name: automatic merge for master when reviewed and CI passes + automatic merge
+      for updates when CI passes
+    conditions: []
+    actions:
+      queue: