Skip to content

Commit

Permalink
feat: 🎸 added new features
Browse files Browse the repository at this point in the history
  • Loading branch information
ADMSK\AVROGAL1 committed Mar 3, 2021
1 parent dcb66aa commit 797c5a6
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 0 deletions.
54 changes: 54 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
pull_request_rules:
- name: automatic merge on CI success require review
conditions:
- status-success=Travis CI - Pull Request
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label!=block-merge
actions:
label:
add:
- github-actions
merge:
method: squash
strict: smart

# if there is a conflict in a backport PR, ping the author to send a proper backport PR
- name: ping author on conflicts
conditions:
- conflict
actions:
comment:
message: This pull request has merge conflicts that must be resolved before it can be merged. @{{author}} please rebase it. https://rook.io/docs/rook/master/development-flow.html#updating-your-fork

# automerge on master only under certain strict conditions
- name: automerge merge master with specific label and approvals with code change
conditions:
- author=mergify[bot]
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label!=do-not-merge
- label=ready-to-merge
actions:
merge:
method: merge
strict: false
dismiss_reviews: { }
delete_head_branch: { }

- name: automatic merge on CI success for TemplateControl
conditions:
- status-success=Travis CI - Pull Request
- label=merge-when-green
- label!=block-merge
actions:
merge:
method: squash
strict: smart

- name: delete branch after merge
conditions:
- merged
actions:
delete_head_branch: { }
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

[![management: perfekt👌](https://img.shields.io/badge/management-perfekt👌-red.svg)](https://github.com/lekterable/perfekt)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/AlexRogalskiy/github-action-screenshots)

<!-- [![Become a sponsor](https://img.shields.io/badge/sponsor-AlexRogalskiy-181717.svg?logo=github)](https://github.com/sponsors/AlexRogalskiy)-->

Expand Down

0 comments on commit 797c5a6

Please sign in to comment.