Skip to content

Commit

Permalink
Merge branch 'master' into jl16
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Mar 5, 2021
2 parents aabd2c5 + 38358e3 commit 10215cf
Showing 1 changed file with 63 additions and 0 deletions.
63 changes: 63 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# [NOTE] This setting relies on "required status check":
# https://docs.github.com/en/github/administering-a-repository/about-required-status-checks

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"
- label=ready-to-merge:squash
- label!=work-in-progress
actions:
merge:
method: squash
- name: automatic squash-merge when CI passes (@tkf)
conditions:
- base=master
- author=tkf
- 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"
- label=ready-to-merge:rebase
- label!=work-in-progress
actions:
merge:
method: rebase
- name: automatic rebase-merge when CI passes (@tkf)
conditions:
- base=master
- author=tkf
- 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"
- label=ready-to-merge:merge
- label!=work-in-progress
actions:
merge:
method: merge
- name: automatic merge when CI passes (@tkf)
conditions:
- base=master
- author=tkf
- label=ready-to-merge:merge
- label!=work-in-progress
actions:
merge:
method: merge

0 comments on commit 10215cf

Please sign in to comment.