aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Koenig2020-04-30 18:53:56 -0700
committerGitHub2020-04-30 18:53:56 -0700
commit58ba9650dcd59a24e7c87fee326cf84faf3a165f (patch)
treead8355b4fe96751d674d6ee1af2ec5a4380458f7
parentec82fa81c98cbffea673169b02c85b5b1375e0ef (diff)
Update Mergify rules to backport to 1.3.x (#1552)
This replaces the rules for 1.2.x
-rw-r--r--.mergify.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.mergify.yml b/.mergify.yml
index 49efa97e..f28da865 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -21,15 +21,15 @@ pull_request_rules:
strict: smart
strict_method: merge
- - name: backport to 1.2.x
+ - name: backport to 1.3.x
conditions:
- merged
- base=master
- - milestone=1.2.X
+ - milestone=1.3.x
actions:
backport:
branches:
- - 1.2.x
+ - 1.3.x
ignore_conflicts: True
label_conflicts: "bp-conflict"
label:
@@ -37,7 +37,7 @@ pull_request_rules:
- name: label Mergify backport PR
conditions:
- - base=1.2.x
+ - base=1.3.x
- body~=This is an automated backport of pull request \#\d+ done by Mergify
actions:
label:
@@ -47,7 +47,7 @@ pull_request_rules:
conditions:
- status-success=continuous-integration/travis-ci/pr
- "#changes-requested-reviews-by=0"
- - base=1.2.x
+ - base=1.3.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"