diff --git a/.mergify.yml b/.mergify.yml index 4f4a8993c7..0a31bfafb5 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -54,7 +54,6 @@ queue_rules: - name: lowprio <<: *DefaultQueueOptions merge_method: merge - speculative_checks: 1 queue_conditions: - "check-success=Rule: Conventional Commit (post_check)" - and: *CheckRuns @@ -75,9 +74,7 @@ queue_rules: batch_size: 7 batch_max_wait_time: 5min queue_branch_merge_method: fast-forward - disallow_checks_interruption_from_queues: - - default - commit_message_template: null + commit_message_template: pull_request_rules: @@ -101,3 +98,19 @@ pull_request_rules: request_reviews: teams: - devs + +merge_queue: + max_parallel_checks: 5 +priority_rules: + - name: priority for queue `hotfix` + conditions: + - label=hotfix + priority: 2500 + - name: priority for queue `default` + conditions: + - "#approved-reviews-by>=2" + - "#changes-requested-reviews-by=0" + - "#review-threads-unresolved=0" + - "#review-requested=0" + - label!=manual merge + priority: 2250