diff --git a/.github/mergify.yml b/.github/mergify.yml index 868594d1d57..6f6464653e1 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -18,30 +18,6 @@ pull_request_rules: commit_message_template: | {{ title }} (#{{ number }}) {{ body }} - - name: backport patches to v1.3.x branch - conditions: - - base=main - - label=backport-to-v1.3.x - actions: - backport: - branches: - - release/v1.3.x - - name: backport patches to v1.4.x branch - conditions: - - base=main - - label=backport-to-v1.4.x - actions: - backport: - branches: - - release/v1.4.x - - name: backport patches to v1.5.x branch - conditions: - - base=main - - label=backport-to-v1.5.x - actions: - backport: - branches: - - release/v1.5.x - name: backport patches to v2.1.x branch conditions: - base=main @@ -81,4 +57,12 @@ pull_request_rules: actions: backport: branches: - - release/v3.1.x + - release/v3.1.x + - name: backport patches to v4.0.x branch + conditions: + - base=main + - label=backport-to-v4.0.x + actions: + backport: + branches: + - release/v4.0.x