diff --git a/.mergify.yml b/.mergify.yml index 1fca661dddda29..ab81476816764c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -73,9 +73,9 @@ pull_request_rules: - automerge comment: message: automerge label removed due to a CI failure - - name: v1.14 feature-gate backport + - name: v1.16 feature-gate backport conditions: - - label=v1.14 + - label=v1.16 - label=feature-gate actions: backport: @@ -86,10 +86,10 @@ pull_request_rules: labels: - feature-gate branches: - - v1.14 - - name: v1.14 non-feature-gate backport + - v1.16 + - name: v1.16 non-feature-gate backport conditions: - - label=v1.14 + - label=v1.16 - label!=feature-gate actions: backport: @@ -97,10 +97,10 @@ pull_request_rules: title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})" ignore_conflicts: true branches: - - v1.14 - - name: v1.16 feature-gate backport + - v1.16 + - name: v1.17 feature-gate backport conditions: - - label=v1.16 + - label=v1.17 - label=feature-gate actions: backport: @@ -110,10 +110,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: @@ -121,7 +121,7 @@ pull_request_rules: title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})" ignore_conflicts: true branches: - - v1.16 + - v1.17 commands_restrictions: # The author of copied PRs is the Mergify user.