From d81bb720b0321e2f473b1418289a53e29fed0b02 Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Wed, 7 Jun 2023 08:36:44 -0400 Subject: [PATCH] add port to unstable rule (#450) (cherry picked from commit 200abd5a1394ac7793e5f93bf45c266176bf45b9) --- .github/mergify.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8067c263a..42ab7a496 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -4,18 +4,6 @@ queue_rules: - "#approved-reviews-by>1" pull_request_rules: - - name: automerge to develop with label automerge and branch protection passing - conditions: - - "#approved-reviews-by>1" - - base=develop - - label=automerge - actions: - queue: - name: default - method: squash - commit_message_template: | - {{ title }} (#{{ number }}) - {{ body }} - name: frontport patches to develop branch conditions: - base=main @@ -32,3 +20,12 @@ pull_request_rules: backport: branches: - main + - name: port patches to unstable branch + conditions: + - base=develop + - label=port/unstable + actions: + backport: + branches: + - unstable +