diff options
| author | Jack Koenig | 2020-05-05 17:13:40 -0700 |
|---|---|---|
| committer | GitHub | 2020-05-05 17:13:40 -0700 |
| commit | facd530880b16c53db67a9a20a95ddf053038f81 (patch) | |
| tree | cfad9d23d7b37165de59d76d2c398cc72f871267 | |
| parent | 726f6ef93ea28535b9db87581d90d8886756f97e (diff) | |
Update Mergify rules to backport to 3.3.x (#1429)
This replaces the rules for 3.2.x
| -rw-r--r-- | .mergify.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.mergify.yml b/.mergify.yml index cbd2b5b4..0deb22a3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -26,15 +26,15 @@ 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: @@ -42,7 +42,7 @@ pull_request_rules: - 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: @@ -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" |