Skip to content

Commit

Permalink
Update .mergify.yml (#2181)
Browse files Browse the repository at this point in the history
Co-authored-by: jackkoenig <jackkoenig@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and jackkoenig committed Apr 19, 2021
1 parent 0a1aa5f commit 1f7faaa
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pull_request_rules:
backport:
branches:
- 1.4.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
Expand All @@ -37,6 +39,8 @@ pull_request_rules:
branches:
- 1.3.x
- 1.4.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
Expand All @@ -53,18 +57,13 @@ pull_request_rules:
- 1.2.x
- 1.3.x
- 1.4.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: label Mergify backport PR
conditions:
- title~=\(bp \#\d+\)
actions:
label:
add:
- Backport
- name: automatic squash-and-mege of 1.2.x backport PRs
conditions:
- status-success=all tests passed
Expand Down

0 comments on commit 1f7faaa

Please sign in to comment.