From 22cac6499d2745c32cc668ea86cfffbafcfed96b Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Tue, 24 Jun 2025 15:43:11 -0400 Subject: [PATCH] try out merge queues also adjust the labels set for the bot to avoid making noise when it's being shoved straight in --- .github/mergify.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index ba329fef4d0..214c53c575d 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -55,6 +55,8 @@ pull_request_rules: - base=master - -draft - -closed + - '-label=merge delay passed' + - '-label=priority: high :fire:' - or: - label=merge me - label=squash+merge me @@ -189,14 +191,21 @@ pull_request_rules: conditions: - body~=automatic backport +merge_queue: + max_parallel_checks: 2 + queue_rules: # Mergify now requires different queues for different strategies - name: default + batch_size: 3 + batch_max_wait_time: 10 min update_bot_account: Mikolaj merge_method: merge update_method: rebase - name: squash-merge + batch_size: 3 + batch_max_wait_time: 10 min update_bot_account: Mikolaj merge_method: squash update_method: merge