Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ pull_request_rules:
- automerge
comment:
message: automerge label removed due to a CI failure
- name: v2.1 feature-gate backport
- name: v2.2 feature-gate backport
conditions:
- label=v2.1
- label=v2.2
- label=feature-gate
actions:
backport:
Expand All @@ -117,21 +117,21 @@ pull_request_rules:
labels:
- feature-gate
branches:
- v2.1
- name: v2.1 non-feature-gate backport
- v2.2
- name: v2.2 non-feature-gate backport
conditions:
- label=v2.1
- label=v2.2
- label!=feature-gate
actions:
backport:
assignees: *BackportAssignee
title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
ignore_conflicts: true
branches:
- v2.1
- name: v2.1 backport warning comment
- v2.2
- name: v2.2 backport warning comment
conditions:
- label=v2.1
- label=v2.2
actions:
comment:
message: >
Expand All @@ -142,9 +142,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: v2.2 feature-gate backport
- name: v2.3 feature-gate backport
conditions:
- label=v2.2
- label=v2.3
- label=feature-gate
actions:
backport:
Expand All @@ -154,21 +154,21 @@ pull_request_rules:
labels:
- feature-gate
branches:
- v2.2
- name: v2.2 non-feature-gate backport
- v2.3
- name: v2.3 non-feature-gate backport
conditions:
- label=v2.2
- label=v2.3
- label!=feature-gate
actions:
backport:
assignees: *BackportAssignee
title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
ignore_conflicts: true
branches:
- v2.2
- name: v2.2 backport warning comment
- v2.3
- name: v2.3 backport warning comment
conditions:
- label=v2.2
- label=v2.3
actions:
comment:
message: >
Expand Down