Skip to content

Commit

Permalink
Merge 95718e3 into a0eb780
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Jan 21, 2020
2 parents a0eb780 + 95718e3 commit 81b2ae9
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
44 changes: 44 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
pull_request_rules:
- name: remove outdated reviews
conditions:
- base=master
actions:
dismiss_reviews: {}
- name: automatic squash-merge when CI passes
conditions:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- label=ready-to-merge:squash
- label!=work-in-progress
actions:
merge:
method: squash
- name: automatic rebase-merge when CI passes
conditions:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- label=ready-to-merge:rebase
- label!=work-in-progress
actions:
merge:
method: rebase
- name: automatic merge when CI passes
conditions:
- base=master
- "#approved-reviews-by>=1"
- status-success=Travis CI - Pull Request
- label=ready-to-merge:merge
- label!=work-in-progress
actions:
merge:
method: merge
- name: automatically approve PR when pushed by me
conditions:
- author=tkf
- base=master
- status-success=Travis CI - Pull Request
- label~=ready-to-merge:.*
actions:
review: {}
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ matrix:
fast_finish: true
notifications:
email: false

# Only build branches via PR to avoid running CI twice.
# https://docs.travis-ci.com/user/conditional-builds-stages-jobs
# https://docs.travis-ci.com/user/conditions-v1
if: branch = master OR tag IS present OR type != push

after_success:
- julia -e 'using Run; Run.after_success_test()'
jobs:
Expand Down

0 comments on commit 81b2ae9

Please sign in to comment.