diff --git a/.mergify.yml b/.mergify.yml index eb683c7d40..a764a76ad8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,6 +1,7 @@ pull_request_rules: - name: Automatically merge on CI success and review conditions: + - base=master - status-success=build - "label=ready to merge" - "approved-reviews-by=@oss-approvers" @@ -10,11 +11,38 @@ pull_request_rules: strict: smart label: add: ["auto merged"] + - name: Automatically merge release branch changes on CI success and release manager review + conditions: + - base~=^release- + - status-success=build + - "label=ready to merge" + - "approved-reviews-by=@release-managers" + actions: + merge: + method: squash + strict: smart + label: + add: ["auto merged"] + # This rule exists to handle release branches that are still building using Travis CI instead of + # using Github actions. It can be deleted once all active release branches are running Github actions. + - name: Automatically merge release branch changes on Travis CI success and release manager review + conditions: + - base~=^release- + - status-success=continuous-integration/travis-ci/pr + - "label=ready to merge" + - "approved-reviews-by=@release-managers" + actions: + merge: + method: squash + strict: smart + label: + add: ["auto merged"] - name: Automatically merge PRs from maintainers on CI success and review conditions: - - status-success=build - - "label=ready to merge" - - "author=@oss-approvers" + - base=master + - status-success=build + - "label=ready to merge" + - "author=@oss-approvers" actions: merge: method: squash @@ -23,6 +51,7 @@ pull_request_rules: add: ["auto merged"] - name: Automatically merge kork autobump PRs on CI success conditions: + - base=master - status-success=build - "label~=autobump-*" - "author:spinnakerbot"