Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Commit

Permalink
fix mergify rules (#797)
Browse files Browse the repository at this point in the history
  • Loading branch information
VitoAlbano authored and erdemedeiros committed Jan 16, 2020
1 parent 877f0f5 commit f121cb2
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,25 @@ pull_request_rules:
conditions:
- author=jx-activiti-cloud
- status-success=continuous-integration/jenkins/pr-head
# - status-success=continuous-integration/travis-ci/pr
# - status-success=continuous-integration/travis-ci/push
#- status-success=license/cla
- status-success=Travis CI - Pull Request
- label!=do-not-merge
actions:
delete_head_branch: {}
merge:
method: merge
strict: true
- name: automatic merge when CI passes and 1 approving reviews
- name: automatic merge when CI passes and all requested reviews approved
conditions:
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- status-success=continuous-integration/jenkins/pr-head
# - status-success=continuous-integration/travis-ci/pr
# - status-success=continuous-integration/travis-ci/push
- status-success=Travis CI - Pull Request
- status-success=license/cla
- label!=do-not-merge
actions:
delete_head_branch: {}
merge:
method: squash
strict: true

0 comments on commit f121cb2

Please sign in to comment.