forked from playframework/play-samples
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade branch 2.6.x using TemplateControl (playframework#64)
* Updated with template-control on 2018-11-29T15:50:43.891Z /.mergify.yml: wrote /.mergify.yml **build.sbt: scalaVersion := "2.12.7" * Remove JDK 9 & 10
- Loading branch information
1 parent
5e63c89
commit 06dc328
Showing
3 changed files
with
59 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
pull_request_rules: | ||
- name: automatic merge on CI success require review | ||
conditions: | ||
- status-success=continuous-integration/travis-ci/pr | ||
- "#approved-reviews-by>=1" | ||
- "#changes-requested-reviews-by=0" | ||
- label=merge-when-green | ||
- label!=block-merge | ||
actions: | ||
merge: | ||
method: squash | ||
strict: smart | ||
|
||
- name: automatic merge on CI success for TemplateControl | ||
conditions: | ||
- status-success=continuous-integration/travis-ci/pr | ||
- label=merge-when-green | ||
- label=template-control | ||
- label!=block-merge | ||
actions: | ||
merge: | ||
method: squash | ||
strict: smart | ||
|
||
# delete any branch when already merged | ||
# doesn't matter if marked with labels or not | ||
- name: delete branch after merge | ||
conditions: | ||
- merged | ||
actions: | ||
delete_head_branch: {} | ||
|
||
# delete 'merge-when-green' label if present and merged | ||
- name: remove label after merge | ||
conditions: | ||
- merged | ||
- label=merge-when-green | ||
actions: | ||
label: | ||
remove: [merge-when-green] | ||
|
||
# delete 'template-control' label if present and merged | ||
- name: remove label after merge | ||
conditions: | ||
- merged | ||
- label=template-control | ||
actions: | ||
label: | ||
remove: [template-control] | ||
|
||
- name: auto add wip | ||
conditions: | ||
# match a few flavours of wip | ||
- title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).* | ||
actions: | ||
label: | ||
add: ["block-merge"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters