diff --git a/.mergify.yml b/.mergify.yml index 68c6426cf37f3b..ef576943d5d635 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -95,9 +95,9 @@ pull_request_rules: - automerge comment: message: automerge label removed due to a CI failure - - name: v1.16 feature-gate backport + - name: v1.17 feature-gate backport conditions: - - label=v1.16 + - label=v1.17 - label=feature-gate actions: backport: @@ -108,10 +108,10 @@ pull_request_rules: labels: - feature-gate branches: - - v1.16 - - name: v1.16 non-feature-gate backport + - v1.17 + - name: v1.17 non-feature-gate backport conditions: - - label=v1.16 + - label=v1.17 - label!=feature-gate actions: backport: @@ -119,10 +119,10 @@ pull_request_rules: title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})" ignore_conflicts: true branches: - - v1.16 - - name: v1.16 backport warning comment + - v1.17 + - name: v1.17 backport warning comment conditions: - - label=v1.16 + - label=v1.17 actions: comment: message: > @@ -133,9 +133,9 @@ pull_request_rules: refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. - - name: v1.17 feature-gate backport + - name: v1.18 feature-gate backport conditions: - - label=v1.17 + - label=v1.18 - label=feature-gate actions: backport: @@ -145,10 +145,10 @@ pull_request_rules: labels: - feature-gate branches: - - v1.17 - - name: v1.17 non-feature-gate backport + - v1.18 + - name: v1.18 non-feature-gate backport conditions: - - label=v1.17 + - label=v1.18 - label!=feature-gate actions: backport: @@ -156,10 +156,10 @@ pull_request_rules: title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})" ignore_conflicts: true branches: - - v1.17 - - name: v1.17 backport warning comment + - v1.18 + - name: v1.18 backport warning comment conditions: - - label=v1.17 + - label=v1.18 actions: comment: message: >