diff options
| author | Jack Koenig | 2020-06-05 14:05:08 -0700 |
|---|---|---|
| committer | GitHub | 2020-06-05 14:05:08 -0700 |
| commit | 2e5071da02a6d575d4f1191e882e44a007defa18 (patch) | |
| tree | 2bd202eaa16c22b58a419d0f4e7dbff78c8adf2d /.mergify.yml | |
| parent | f47d812d23abd32be470edc9e0d5a5cecb23bf4b (diff) | |
Restore backporting to 3.2.x (#1460)
Diffstat (limited to '.mergify.yml')
| -rw-r--r-- | .mergify.yml | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/.mergify.yml b/.mergify.yml index 0deb22a3..72f8e424 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -40,6 +40,21 @@ pull_request_rules: label: add: [Backported] + - name: backport to 3.2.x and 3.3.x + conditions: + - merged + - base=master + - milestone=3.2.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.3.x @@ -48,7 +63,7 @@ pull_request_rules: label: add: [Backport] - - name: automatic squash-and-merge of backport PRs + - name: automatic squash-and-merge of 3.3.x backport PRs conditions: - "status-success=ci/circleci: build-firrtl" - "status-success=ci/circleci: build-prep" @@ -67,3 +82,23 @@ pull_request_rules: method: squash strict: smart strict_method: merge + + - name: automatic squash-and-merge of 3.2.x backport PRs + conditions: + - "status-success=ci/circleci: build-firrtl" + - "status-success=ci/circleci: build-prep" + - "status-success=ci/circleci: checkstyle-chisel" + - "status-success=ci/circleci: test-chisel-2_11" + - "status-success=ci/circleci: test-chisel-2_12" + - "status-success=ci/circleci: check-binary-compatibility" + - status-success=license/cla + - "#changes-requested-reviews-by=0" + - base=3.2.x + - label="Backport" + - label!="DO NOT MERGE" + - label!="bp-conflict" + actions: + merge: + method: squash + strict: smart + strict_method: merge |