From 53471fc1d635787bdb6e5fed1cc35dc8df3eba50 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:38:59 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 04fa184e5..08933a17b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,21 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - label!=no-mergify
+      - -draft
+      - approved-reviews-by=@fedora-infra/data-team
+      - "#changes-requested-reviews-by=0"
+      - check-success=Checks
+      - check-success=Licenses (models)
+      - check-success=Licenses (consumer)
+      - check-success=Licenses (commands)
+      - check-success=Unit tests (3.10, models)
+      - check-success=Unit tests (3.10, consumer)
+      - check-success=Unit tests (3.10, commands)
+      - check-success=Unit tests (3.11, models)
+      - check-success=Unit tests (3.11, consumer)
+      - check-success=Unit tests (3.11, commands)
+    merge_conditions:
       # Conditions to get out of the queue (= merged)
       - check-success=Checks
       - check-success=Licenses (models)
@@ -12,27 +27,10 @@ queue_rules:
       - check-success=Unit tests (3.11, models)
       - check-success=Unit tests (3.11, consumer)
       - check-success=Unit tests (3.11, commands)
-
+    merge_method: rebase
 
 pull_request_rules:
-
-- name: Merge on approval
-  actions:
-    queue:
-      name: default
-      method: rebase
-  conditions:
-    - label!=no-mergify
-    - -draft
-    - approved-reviews-by=@fedora-infra/data-team
-    - "#changes-requested-reviews-by=0"
-    - check-success=Checks
-    - check-success=Licenses (models)
-    - check-success=Licenses (consumer)
-    - check-success=Licenses (commands)
-    - check-success=Unit tests (3.10, models)
-    - check-success=Unit tests (3.10, consumer)
-    - check-success=Unit tests (3.10, commands)
-    - check-success=Unit tests (3.11, models)
-    - check-success=Unit tests (3.11, consumer)
-    - check-success=Unit tests (3.11, commands)
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: