From 2e2f1609b9a53f6ee42b0c5b6bf1128649609d73 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 4 Feb 2025 21:37:19 +0100 Subject: [PATCH 1/4] mergify: support backport-active-branches and backport-active-minors --- .mergify.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index c362b6f6b..cec9dc829 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -316,3 +316,42 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + + - name: backport patches to all active minor branches + conditions: + - merged + - label=backport-active-minors + actions: + backport: + assignees: + - "{{ author }}" + # NOTE: this list needs to be changed when a new minor branch is created + # or an existing minor branch reached EOL. + branches: + - "9.0" + - "8.18" + - "8.17" + - "8.16" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to all active branches + conditions: + - merged + - label=backport-active-branches + actions: + backport: + assignees: + - "{{ author }}" + # NOTE: this list needs to be changed when a new minor branch is created + # or an existing release branch reached EOL. + branches: + - "9.0" + - "8.18" + - "8.17" + - "8.16" + - "8.x" + - "7.17" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" From 37c145b1c26f2aad84641706d32375b76e6862e3 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 4 Feb 2025 21:39:09 +0100 Subject: [PATCH 2/4] mergify: support backport-active-branches and backport-active-minors --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index cec9dc829..51e6c949a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -277,6 +277,8 @@ pull_request_rules: To fixup this pull request, you need to add the backport labels for the needed branches, such as: * `backport-./d./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit + * `backport-active-branches` is the label to automatically backport to all active branches + * `backport-active-minors` is the label to automatically backport to all active minor branches - name: backport patches to 8.17 branch conditions: - merged From 9cfefb6ebcfcfc6b788ee52b4a550d15339e1025 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 5 Feb 2025 13:46:00 +0100 Subject: [PATCH 3/4] changed the backports --- .mergify.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 51e6c949a..d5e384618 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -276,9 +276,9 @@ pull_request_rules: This pull request does not have a backport label. Could you fix it @{{author}}? 🙏 To fixup this pull request, you need to add the backport labels for the needed branches, such as: - * `backport-./d./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit - * `backport-active-branches` is the label to automatically backport to all active branches - * `backport-active-minors` is the label to automatically backport to all active minor branches + * `backport-active-all` is the label that automatically backports to all active branches. + * `backport-active-8` is the label that automatically backports to all active minor branches for the 8 major. + * `backport-active-9` is the label that automatically backports to all active minor branches for the 9 major. - name: backport patches to 8.17 branch conditions: - merged @@ -319,10 +319,10 @@ pull_request_rules: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - - name: backport patches to all active minor branches + - name: backport patches to all active minor branches for the 8 major. conditions: - merged - - label=backport-active-minors + - label=backport-active-8 actions: backport: assignees: @@ -330,17 +330,31 @@ pull_request_rules: # NOTE: this list needs to be changed when a new minor branch is created # or an existing minor branch reached EOL. branches: - - "9.0" - "8.18" - "8.17" - "8.16" labels: - "backport" title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" + - name: backport patches to all active minor branches for the 9 major. + conditions: + - merged + - label=backport-active-9 + actions: + backport: + assignees: + - "{{ author }}" + # NOTE: this list needs to be changed when a new minor branch is created + # or an existing minor branch reached EOL. + branches: + - "9.0" + labels: + - "backport" + title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}" - name: backport patches to all active branches conditions: - merged - - label=backport-active-branches + - label=backport-active-all actions: backport: assignees: From ae27370dc1d1166d7e129028d065db56473cd9e7 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 5 Feb 2025 13:46:58 +0100 Subject: [PATCH 4/4] changed the backports --- .mergify.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mergify.yml b/.mergify.yml index d5e384618..801c5890d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -276,6 +276,7 @@ pull_request_rules: This pull request does not have a backport label. Could you fix it @{{author}}? 🙏 To fixup this pull request, you need to add the backport labels for the needed branches, such as: + * `backport-./d./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit * `backport-active-all` is the label that automatically backports to all active branches. * `backport-active-8` is the label that automatically backports to all active minor branches for the 8 major. * `backport-active-9` is the label that automatically backports to all active minor branches for the 9 major.