Skip to content

Commit 72c4ac9

Browse files
authored
Update mergify config (#937)
* Update mergify config - Allow automatic merging of PRs that have passed the CI and have at least one passing review and no outstanding reviews. * Update mergify config Enable smarter auto merging
1 parent 1085ecd commit 72c4ac9

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

.mergify.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
pull_request_rules:
2-
- name: Automatic merge on up to date branch with dual approval
2+
- name: Automatic merge passing PR on up to date branch with approving CR
33
conditions:
4-
- "#approved-reviews-by>=2"
4+
- "#approved-reviews-by>=1"
5+
- "#review-requested=0"
6+
- "#changes-requested-reviews-by=0"
7+
- "#commented-reviews-by=0"
58
- "status-success=continuous-integration/travis-ci/pr"
69
- "label!=work-in-progress"
710
actions:
811
merge:
912
method: merge
10-
strict: true
13+
strict: smart+fasttrack
14+
- name: Request Brian to review changes on core api.
15+
conditions:
16+
- "-files~=^can/interfaces/$"
17+
- "-closed"
18+
- "author!=hardbyte"
19+
actions:
20+
request_reviews:
21+
users:
22+
- hardbyte
23+
24+
- name: delete head branch after merge
25+
conditions:
26+
- merged
27+
actions:
28+
delete_head_branch: {}

README.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ python-can
3737
:target: https://codecov.io/gh/hardbyte/python-can/branch/develop
3838
:alt: Test coverage reports on Codecov.io
3939

40+
.. image:: https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/hardbyte/python-can&style=flat
41+
:target: https://mergify.io
42+
:alt: Mergify Status
43+
4044
The **C**\ ontroller **A**\ rea **N**\ etwork is a bus standard designed
4145
to allow microcontrollers and devices to communicate with each other. It
4246
has priority based bus arbitration and reliable deterministic

0 commit comments

Comments
 (0)