Skip to content

Commit

Permalink
Update Mergify rules to backport to 3.3.x (#1429)
Browse files Browse the repository at this point in the history
This replaces the rules for 3.2.x
  • Loading branch information
jackkoenig authored May 6, 2020
1 parent 726f6ef commit facd530
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ pull_request_rules:
strict: smart
strict_method: merge

- name: backport to 3.2.x
- name: backport to 3.3.x
conditions:
- merged
- base=master
- milestone=3.2.X
- milestone=3.3.x
actions:
backport:
branches:
- 3.2.x
- 3.3.x
ignore_conflicts: True
label_conflicts: "bp-conflict"
label:
add: [Backported]

- name: label Mergify backport PR
conditions:
- base=3.2.x
- base=3.3.x
- body~=This is an automated backport of pull request \#\d+ done by Mergify
actions:
label:
Expand All @@ -58,7 +58,7 @@ pull_request_rules:
- "status-success=ci/circleci: check-binary-compatibility"
- status-success=license/cla
- "#changes-requested-reviews-by=0"
- base=3.2.x
- base=3.3.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
Expand Down

0 comments on commit facd530

Please sign in to comment.