From a164b71ecd246b9159f332cc00f71da84daac77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Tue, 1 Oct 2024 11:15:16 +0100 Subject: [PATCH] ci/mergify: add merge rule for backport to 0.44 (cherry picked from commit b0ae7bcc9e87c77020a4ecfefb7f9c3e613b887e) --- .mergify.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 770050c079..caae37ed33 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,15 +6,24 @@ queue_rules: - "#approved-reviews-by >= 1" - base = main merge_method: merge - + + - name: backport-0.44-queue + speculative_checks: 3 + batch_size: 3 + queue_conditions: + - "#approved-reviews-by >= 1" + - base = "0.44.0" + merge_method: merge pull_request_rules: - - name: automatic merge to main + - name: automatic merge to main or backport branch conditions: - label = "merge" - label != "do-not-merge" - "#approved-reviews-by >= 1" - - base = main + - or: + - base = main + - base = "0.44.0" actions: queue: autosquash: true