Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 49 additions & 19 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,43 @@
queue_rules:
- name: default
conditions:
- name: duplicated default from Merge for bots
queue_conditions:
- base~=(mainline|rename-commands)
- "#approved-reviews-by>=2"
- approved-reviews-by=@aws/aws-ecs-devx
- -approved-reviews-by~=author
- status-success=build (compile-linux)
- status-success=build (compile-windows)
- status-success=build (compile-darwin)
- status-success=test
- status-success=staticcheck
- status-success=license
- -label~=(WIP|do-not-merge)
- -title~=(WIP|wip)
- -merged
- -closed
- author!=dependabot[bot]
- base=mainline
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- status-success=build (compile-linux)
- status-success=build (compile-windows)
- status-success=build (compile-darwin)
- status-success=test
- status-success=staticcheck
- status-success=license
- author=dependabot[bot]
- -title~=(WIP|wip)
- -label~=(WIP|do-not-merge)
- -merged
- -closed
merge_conditions: []
commit_message_template: |
{{ title }} (#{{ number }})

pull_request_rules:
- name: Merge for developers
conditions:
{{ body }}
merge_method: squash
- name: default
queue_conditions:
- base~=(mainline|rename-commands)
- "#approved-reviews-by>=2"
- approved-reviews-by=@aws/aws-ecs-devx
Expand All @@ -26,14 +53,20 @@ pull_request_rules:
- -merged
- -closed
- author!=dependabot[bot]
actions:
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
merge_conditions:
- status-success=build (compile-linux)
- status-success=build (compile-windows)
- status-success=build (compile-darwin)
- status-success=test
- status-success=staticcheck
- status-success=license
commit_message_template: |
{{ title }} (#{{ number }})

{{ body }}
merge_method: squash

{{ body }}
pull_request_rules:
- name: Merge for bots
conditions:
- base=mainline
Expand All @@ -53,13 +86,6 @@ pull_request_rules:
actions:
review:
type: APPROVE
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})

{{ body }}
- name: Ask Japanese docs reviews
conditions:
- files~=\.ja.md$
Expand All @@ -68,3 +94,7 @@ pull_request_rules:
request_reviews:
users:
- hkford
- name: Merge for bots + Merge for developers
conditions: []
actions:
queue:
Loading