From 1b9e8845cbd8368a7439f820d0d4d88b7003ef90 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 24 May 2025 17:49:35 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 30abd30fc..a4cf27a51 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,6 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=main
       - status-success=build (3.10)
       - status-success=build (3.11)
@@ -8,10 +8,7 @@ queue_rules:
       - approved-reviews-by=@sgkit-dev/committers
       - "#approved-reviews-by>=1"
       - label=auto-merge
-
-pull_request_rules:
-  - name: automatic merge
-    conditions:
+    merge_conditions:
       - base=main
       - status-success=build (3.10)
       - status-success=build (3.11)
@@ -19,10 +16,9 @@ pull_request_rules:
       - approved-reviews-by=@sgkit-dev/committers
       - "#approved-reviews-by>=1"
       - label=auto-merge
-    actions:
-      queue:
-        name: default
-        method: rebase
+    merge_method: rebase
+
+pull_request_rules:
   - name: deleting merged branch
     conditions:
       - merged
@@ -44,3 +40,7 @@ pull_request_rules:
       label:
         remove:
           - conflict
+  - name: automatic merge
+    conditions: []
+    actions:
+      queue: