Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Mergify rules to backport to 3.3.x #1429

Merged
merged 1 commit into from
May 6, 2020
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
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