Remove strict from automerge, add rebase opt in

This commit is contained in:
Michael Vines 2020-06-17 20:52:39 -07:00
parent 7afb5eee78
commit 5b9cd72d8f
1 changed files with 13 additions and 2 deletions

View File

@ -4,16 +4,27 @@
# #
# https://doc.mergify.io/ # https://doc.mergify.io/
pull_request_rules: pull_request_rules:
- name: automatic merge on CI success - name: automatic merge (squash) on CI success
conditions: conditions:
- status-success=buildkite/solana - status-success=buildkite/solana
#- status-success=Travis CI - Pull Request #- status-success=Travis CI - Pull Request
- status-success=ci-gate - status-success=ci-gate
- label=automerge - label=automerge
- author≠@dont-squash-my-commits
actions: actions:
merge: merge:
method: squash method: squash
strict: true # Join the dont-squash-my-commits group if you won't like your commits squashed
- name: automatic merge (rebase) on CI success
conditions:
- status-success=buildkite/solana
#- status-success=Travis CI - Pull Request
- status-success=ci-gate
- label=automerge
- author=@dont-squash-my-commits
actions:
merge:
method: rebase
- name: remove automerge label on CI failure - name: remove automerge label on CI failure
conditions: conditions:
- label=automerge - label=automerge