diff --git a/.mergify.yml b/.mergify.yml index 071634989..e28c55bfa 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,7 +21,7 @@ pull_request_rules: strict: smart dismiss_reviews: {} delete_head_branch: {} - - name: backport patches to release branch + - name: backport patches to release v1.2.0 branch conditions: - base=master - label=backport-to-release-v1.2.0 @@ -45,3 +45,27 @@ pull_request_rules: strict: smart dismiss_reviews: {} delete_head_branch: {} + - name: backport patches to release-v2.0 branch + conditions: + - base=master + - label=backport-to-release-v2.0 + actions: + backport: + branches: + - release-v2.0 + # automerge backports if CI successfully ran + - name: automerge backport release-v2.0 + conditions: + - author=mergify[bot] + - base=release-v2.0 + - label!=DNM + - "#changes-requested-reviews-by=0" + - "#approved-reviews-by>=1" + - "status-success=continuous-integration/travis-ci/pr" + actions: + merge: + method: rebase + rebase_fallback: merge + strict: smart + dismiss_reviews: {} + delete_head_branch: {}