ci(mergify): upgrade configuration to current format

Mergifyio · Nov 25, 2024 · 90ceacc · 90ceacc
1 parent b89c318
commit 90ceacc
Showing 1 changed file with 61 additions and 45 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -11,16 +11,75 @@ queue_rules:
     conditions:
       - and: *CheckRuns
       - schedule=Mon-Fri 09:00-17:30[Europe/Paris]
-  - name: lowprio
+  - name: duplicated lowprio from automatic merge from trivy
+    queue_conditions:
+      - and:
+          - check-success=linters
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - author=mergify-ci-bot
+      - label!=manual merge
+      - "title~=^chore: bump"
+      - "#commits=1"
+      - head~=^clifus/
+      - 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: []
     allow_inplace_checks: true
-    conditions:
+    batch_size: 7
+    batch_max_wait_time: 5min
+    queue_branch_merge_method: fast-forward
+    disallow_checks_interruption_from_queues:
+      - default
+    merge_method: merge
+    commit_message_template:
+  - name: duplicated lowprio from automatic merge from dependabot
+    queue_conditions:
+      - and:
+          - check-success=linters
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - author=mergify-ci-bot
+      - label!=manual merge
+      - "title~=^chore: bump"
+      - "#commits=1"
+      - head~=^clifus/
+      - and: *CheckRuns
+      - "check-success=Rule: Conventional Commit (post_check)"
+      - author=dependabot[bot]
+      - label!=manual merge
+      - "#commits=1"
+    merge_conditions: []
+    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
+    commit_message_template:
+  - name: lowprio
+    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: *CheckRuns
       - 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
 
 pull_request_rules:
   - name: automatic merge for hotfix
@@ -62,49 +121,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]