ci(mergify): upgrade configuration to current format (#6414)

* ci(mergify): upgrade configuration to current format * their automated process didn't clean up the now empty rule Signed-off-by: Amndeep Singh Mann <[email protected]> --------- Signed-off-by: Amndeep Singh Mann <[email protected]> Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Amndeep Singh Mann <[email protected]>
mitre · Dec 30, 2024 · fb51b86 · fb51b86
1 parent 7ae42e7
commit fb51b86
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,17 +1,13 @@
 queue_rules:
-  - name: default
-    conditions:
+  - name: default # automatic merge for master when reviewed and CI passes
+    queue_conditions:
+      - label=ready-to-merge
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - base=master
+    merge_method: squash
 
 pull_request_rules:
-  - name: automatic merge for master when reviewed and CI passes
-    conditions:
-      - label=ready-to-merge
-    actions:
-      queue:
-        name: default
-        method: squash
   - name: delete head branch after merge
     conditions:
       - merged
@@ -22,5 +18,5 @@ pull_request_rules:
       - conflict
       - -author~=^dependabot(|-preview)\[bot\]$
     actions:
-        comment:
-          message: This pull request has a conflict. Could you fix it @{{author}}?
+      comment:
+        message: This pull request has a conflict. Could you fix it @{{author}}?