Skip to content

Commit 30a5638

Browse files
committed
mergify: document each step
+ move merge related things as the last in the list there.
1 parent 3d2f57f commit 30a5638

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

.mergify.yml

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# For instance for needs: work if CI failed, we just add a label as action.
2323

2424
pull_request_rules:
25-
# From review to needs: work - reviewers request
25+
# From needs: review to needs: work - reviewers request
2626
- name: "label needs: work when changes were requested"
2727
conditions:
2828
# Reviewers
@@ -34,7 +34,7 @@ pull_request_rules:
3434
remove:
3535
- "needs: review"
3636

37-
# From review to needs: work - CI failure
37+
# From needs: review to needs: work - CI failure
3838
- name: "label needs: work when travis-ci failed"
3939
conditions:
4040
# Travis failing
@@ -46,7 +46,7 @@ pull_request_rules:
4646
remove:
4747
- "needs: review"
4848

49-
# From review to needs: work - CI failure
49+
# From needs: review to needs: work - CI failure
5050
- name: "label needs: work when Jenkins CI failed - pr head"
5151
conditions:
5252
# Jenkins CI failing
@@ -58,7 +58,7 @@ pull_request_rules:
5858
remove:
5959
- "needs: review"
6060

61-
# From review to needs: work - CI failure
61+
# From needs: review to needs: work - CI failure
6262
- name: "label needs: work when Jenkins CI failed - any of the pipeline"
6363
conditions:
6464
# Jenkins CI failing - any of the pipeline
@@ -70,6 +70,7 @@ pull_request_rules:
7070
remove:
7171
- "needs: review"
7272

73+
# From needs: review to needs: CI
7374
- name: "label needs: CI when at least one reviewers approval"
7475
conditions:
7576
# Labels
@@ -91,23 +92,7 @@ pull_request_rules:
9192
remove:
9293
- "needs: review"
9394

94-
- name: remove ready for merge when merged
95-
conditions:
96-
- merged
97-
- label=ready for merge
98-
actions:
99-
label:
100-
remove:
101-
- ready for merge
102-
103-
- name: add "do not merge" label when WIP is in title
104-
conditions:
105-
- title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
106-
actions:
107-
label:
108-
add:
109-
- do not merge
110-
95+
# Conflict in the PR - needs: work and a comment to notify a user
11196
- name: "label needs: work when there is a conflict"
11297
conditions:
11398
- conflict
@@ -128,6 +113,7 @@ pull_request_rules:
128113
add:
129114
- "release-version: feature branch"
130115

116+
# Ready for integration. Not yet auto merge, will be enabled once carefuly tested
131117
- name: label "ready for merge" when ready
132118
conditions:
133119
# Labels
@@ -151,3 +137,21 @@ pull_request_rules:
151137
remove:
152138
- "needs: CI"
153139

140+
# Clean-up after merge
141+
- name: remove ready for merge when merged
142+
conditions:
143+
- merged
144+
- label=ready for merge
145+
actions:
146+
label:
147+
remove:
148+
- ready for merge
149+
150+
- name: add "do not merge" label when WIP is in title
151+
conditions:
152+
- title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
153+
actions:
154+
label:
155+
add:
156+
- do not merge
157+

0 commit comments

Comments
 (0)