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

* ci(mergify): upgrade configuration to current format * Update rule name and queue name --------- Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Mario Rodriguez Molins <[email protected]>
elastic · Nov 22, 2024 · 8cc126a · 8cc126a
1 parent 12f09d2
commit 8cc126a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,7 +1,13 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - check-success=buildkite/elastic-package
+      - check-success=CLA
+      - base=main
+      - author~=^dependabot(|-preview)\[bot\]$
+    merge_conditions:
       - check-success=buildkite/elastic-package
+    merge_method: squash
 
 pull_request_rules:
   - name: automatic approval for Dependabot pull requests
@@ -12,12 +18,7 @@ pull_request_rules:
         type: APPROVE
         message: Automatically approving dependabot
   - name: automatic merge of bot 🤖
-    conditions:
-      - check-success=buildkite/elastic-package
-      - check-success=CLA
-      - base=main
-      - author~=^dependabot(|-preview)\[bot\]$
+    conditions: []
     actions:
       queue:
-        method: squash
         name: default