From 9a9fc4520dcffc4ff4fe4bbca63f8a3e3e9b2547 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 08:19:31 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 67 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index bf95b82f28..0269ce4447 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,44 +1,45 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - and:
+          - base=master
+          - "#approved-reviews-by>=1"
+          - check-success=gomod
+          - check-success=lint
+          - check-success=test (test)
+          - check-success=test (integration-test)
+          - check-success=test (helm-test)
+          - check-success=build (controller)
+          - check-success=build (kanctl)
+          - check-success=build (kando)
+          - check-success=docs
+          - label=kueue
+          - label!="hold off merging"
+    merge_conditions:
       - and:
-        - "#approved-reviews-by>=1"
-        - check-success=gomod
-        - check-success=lint
-        - check-success=test (test)
-        - check-success=test (integration-test)
-        - check-success=test (helm-test)
-        - check-success=build (controller)
-        - check-success=build (kanctl)
-        - check-success=build (kando)
-        - check-success=docs
-        - label=kueue
-        - label!="hold off merging"
+          - "#approved-reviews-by>=1"
+          - check-success=gomod
+          - check-success=lint
+          - check-success=test (test)
+          - check-success=test (integration-test)
+          - check-success=test (helm-test)
+          - check-success=build (controller)
+          - check-success=build (kanctl)
+          - check-success=build (kando)
+          - check-success=docs
+          - label=kueue
+          - label!="hold off merging"
+
+    merge_method: squash
 
 pull_request_rules:
-  - name: Automatic merge
-    conditions:
-      - and:
-        - base=master
-        - "#approved-reviews-by>=1"
-        - check-success=gomod
-        - check-success=lint
-        - check-success=test (test)
-        - check-success=test (integration-test)
-        - check-success=test (helm-test)
-        - check-success=build (controller)
-        - check-success=build (kanctl)
-        - check-success=build (kando)
-        - check-success=docs
-        - label=kueue
-        - label!="hold off merging"
-    actions:
-      queue:
-        name: default
-        method: squash
   - name: delete head branch after merge
     conditions:
       - merged
     actions:
       delete_head_branch:
         force: false
+  - name: Automatic merge
+    conditions: []
+    actions:
+      queue: