From 8cc126ae5015dd336b22901c365e8c98db4e7c15 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 12:29:36 +0100
Subject: [PATCH] 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 <mario.rodriguez@elastic.co>
---
 .mergify.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 16e81755e..f876bc0a6 100644
--- 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