From 6c724436fd507b5a99e8ba56bd526a87b7a81530 Mon Sep 17 00:00:00 2001 From: Justin Tieri <37750742+jtieri@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:27:46 -0500 Subject: [PATCH] ci: update mergify to reflect currently maintained branches --- .github/mergify.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 7c05eca9..9c4d2621 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,14 +2,13 @@ pull_request_rules: - name: backport to maintained branches conditions: - - base~=^(main|release/v4|release/v5|release/v6)$ + - base~=^(main|release/v7|release/v6)$ - label=BACKPORT actions: backport: branches: - main - - release/v4 - - release/v5 + - release/v7 - release/v6 assignees: - "{{ author }}" @@ -21,7 +20,7 @@ pull_request_rules: - name: automerge backported PR's for maintained branches conditions: - label=automerge - - base~=^(release/v4|release/v5|release/v6)$ + - base~=^(release/v6|release/v7)$ actions: merge: method: squash \ No newline at end of file