diff --git a/.mergify.yml b/.mergify.yml index 5cae9b59853f2f..eaadb978adae43 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -91,9 +91,9 @@ pull_request_rules: - automerge comment: message: automerge label removed due to a CI failure - - name: v1.17 feature-gate backport + - name: v1.18 feature-gate backport conditions: - - label=v1.17 + - label=v1.18 - label=feature-gate actions: backport: @@ -104,10 +104,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: @@ -115,10 +115,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: > @@ -129,9 +129,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.18 feature-gate backport + - name: v2.0 feature-gate backport conditions: - - label=v1.18 + - label=v2.0 - label=feature-gate actions: backport: @@ -141,10 +141,10 @@ pull_request_rules: labels: - feature-gate branches: - - v1.18 - - name: v1.18 non-feature-gate backport + - v2.0 + - name: v2.0 non-feature-gate backport conditions: - - label=v1.18 + - label=v2.0 - label!=feature-gate actions: backport: @@ -152,10 +152,10 @@ pull_request_rules: title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})" ignore_conflicts: true branches: - - v1.18 - - name: v1.18 backport warning comment + - v2.0 + - name: v2.0 backport warning comment conditions: - - label=v1.18 + - label=v2.0 actions: comment: message: >