From 94a6ca78f62abffc57599f4b31810e48f13d8273 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 24 Oct 2024 08:37:47 -0700 Subject: [PATCH 1/2] Update .mergify.yml --- .mergify.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index d5b80f2a0d..8c1aaf34d1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,6 +13,19 @@ pull_request_rules: git merge upstream/{{base}} git push upstream {{head}} ``` + - name: backport patches to main branch + conditions: + - merged + - label=backport-main + actions: + backport: + assignees: + - "{{ author }}" + labels: + - "backport" + branches: + - "main" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - name: backport patches to 8.17 branch conditions: - merged From 374735b98bcec307f5b210adc17de2e3d5797038 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 24 Oct 2024 13:45:58 -0700 Subject: [PATCH 2/2] Update .mergify.yml Co-authored-by: Joe Peeples --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 8c1aaf34d1..d23f89f7b6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -25,7 +25,7 @@ pull_request_rules: - "backport" branches: - "main" - title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" - name: backport patches to 8.17 branch conditions: - merged