From a9f15b3ec9a40db3b09aaa10fac2a6db3ac0d57d Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 12:07:11 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 103 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 43 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 6dd9209..5b9afbc 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -11,6 +11,66 @@ queue_rules:
     conditions:
       - and: *CheckRuns
       - schedule=Mon-Fri 09:00-17:30[Europe/Paris]
+  - name: duplicated lowprio from automatic merge for clifus version bump
+    queue_conditions:
+      - and: *CheckRuns
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - author=mergify-ci-bot
+      - label!=manual merge
+      - "title~=^chore: bump"
+      - "#commits=1"
+      - head~=^clifus/
+    merge_conditions:
+      - and:
+          - check-success=linters
+      - schedule=Mon-Fri 09:00-17:00[Europe/Paris]
+    allow_inplace_checks: true
+    batch_size: 7
+    batch_max_wait_time: 5min
+    queue_branch_merge_method: fast-forward
+    disallow_checks_interruption_from_queues:
+      - default
+    merge_method: merge
+  - name: duplicated lowprio from automatic merge from trivy
+    queue_conditions:
+      - and: *CheckRuns
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - head=trivy/daily-report
+      - author=mergify-ci-bot
+      - label!=manual merge
+      - label!=new CVE
+      - "#commits=1"
+    merge_conditions:
+      - and:
+          - check-success=linters
+      - schedule=Mon-Fri 09:00-17:00[Europe/Paris]
+    allow_inplace_checks: true
+    batch_size: 7
+    batch_max_wait_time: 5min
+    queue_branch_merge_method: fast-forward
+    disallow_checks_interruption_from_queues:
+      - default
+    commit_message_template:
+    merge_method: merge
+  - name: duplicated lowprio from automatic merge from dependabot
+    queue_conditions:
+      - and: *CheckRuns
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - author=dependabot[bot]
+      - label!=manual merge
+      - "#commits=1"
+    merge_conditions:
+      - and:
+          - check-success=linters
+      - schedule=Mon-Fri 09:00-17:00[Europe/Paris]
+    allow_inplace_checks: true
+    batch_size: 7
+    batch_max_wait_time: 5min
+    queue_branch_merge_method: fast-forward
+    disallow_checks_interruption_from_queues:
+      - default
+    commit_message_template:
+    merge_method: merge
   - name: lowprio
     allow_inplace_checks: true
     conditions:
@@ -62,49 +122,6 @@ pull_request_rules:
       - label!=manual merge
     actions:
       queue:
-
-  - name: automatic merge for clifus version bump
-    conditions:
-      - and: *CheckRuns
-      - "check-success=Rule: Conventional Commit (post_check)"
-      - author=mergify-ci-bot
-      - label!=manual merge
-      - "title~=^chore: bump"
-      - "#commits=1"
-      - head~=^clifus/
-    actions:
-      queue:
-        name: lowprio
-        method: merge
-
-  - name: automatic merge from trivy
-    conditions:
-      - and: *CheckRuns
-      - "check-success=Rule: Conventional Commit (post_check)"
-      - head=trivy/daily-report
-      - author=mergify-ci-bot
-      - label!=manual merge
-      - label!=new CVE
-      - "#commits=1"
-    actions:
-      queue:
-        name: lowprio
-        commit_message_template:
-        method: merge
-
-  - name: automatic merge from dependabot
-    conditions:
-      - and: *CheckRuns
-      - "check-success=Rule: Conventional Commit (post_check)"
-      - author=dependabot[bot]
-      - label!=manual merge
-      - "#commits=1"
-    actions:
-      queue:
-        name: lowprio
-        method: merge
-        commit_message_template:
-
   - name: request review
     conditions:
       - -author=dependabot[bot]