diff options
| author | Jack Koenig | 2020-11-04 14:51:17 -0800 |
|---|---|---|
| committer | GitHub | 2020-11-04 14:51:17 -0800 |
| commit | 64e1ea1e8e4667649b648d7156027c450e24c788 (patch) | |
| tree | 4532e12956083c0d7524268aa22a0d52266b447b | |
| parent | d1c0181e716c37142e233beed2efcea5c5794aa7 (diff) | |
Add 1.4.x to Mergify (#1920)
| -rw-r--r-- | .mergify.yml | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/.mergify.yml b/.mergify.yml index a2ce87b1..b09c861a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,7 +21,21 @@ pull_request_rules: strict: smart strict_method: merge - - name: backport to 1.3.x + - name: backport to 1.4.x + conditions: + - merged + - base=master + - milestone=1.4.x + actions: + backport: + branches: + - 1.4.x + ignore_conflicts: True + label_conflicts: "bp-conflict" + label: + add: [Backported] + + - name: backport to 1.3.x and 1.4.x conditions: - merged - base=master @@ -30,12 +44,13 @@ pull_request_rules: backport: branches: - 1.3.x + - 1.4.x ignore_conflicts: True label_conflicts: "bp-conflict" label: add: [Backported] - - name: backport to 1.2.x and 1.3.x + - name: backport to 1.2.x, 1.3.x, and 1.4.x conditions: - merged - base=master @@ -45,18 +60,32 @@ pull_request_rules: branches: - 1.2.x - 1.3.x + - 1.4.x ignore_conflicts: True label_conflicts: "bp-conflict" label: add: [Backported] - - name: label Mergify backport PR conditions: - body~=This is an automated backport of pull request \#\d+ done by Mergify actions: label: add: [Backport] + + - name: automatic squash-and-merge of 1.4.x backport PRs + conditions: + - status-success=Travis CI - Pull Request + - "#changes-requested-reviews-by=0" + - base=1.4.x + - label="Backport" + - label!="DO NOT MERGE" + - label!="bp-conflict" + actions: + merge: + method: squash + strict: smart + strict_method: merge - name: automatic squash-and-merge of 1.3.x backport PRs conditions: |