Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(mergify): upgrade configuration to current format #5991

Open
wants to merge 1 commit into
base: mainline
Choose a base branch
from
Open
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
79 changes: 54 additions & 25 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,71 @@
queue_rules:
- name: default
conditions:
- name: duplicated default from Merge for developers
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]
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 }})

pull_request_rules:
- name: Merge for developers
conditions:
- base~=(mainline|rename-commands)
- "#approved-reviews-by>=2"
- approved-reviews-by=@aws/aws-ecs-devx
- -approved-reviews-by~=author
{{ body }}
merge_method: squash
- name: duplicated default from Merge for bots
queue_conditions:
- 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
- -label~=(WIP|do-not-merge)
- author=dependabot[bot]
- -title~=(WIP|wip)
- -label~=(WIP|do-not-merge)
- -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
- name: default
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

{{ body }}
pull_request_rules:
- name: Merge for bots
conditions:
- base=mainline
Expand All @@ -53,13 +85,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 +93,7 @@ pull_request_rules:
request_reviews:
users:
- hkford
- name: Merge for bots + Merge for developers
conditions: []
actions:
queue: