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
48 changes: 35 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- name: duplicated default from Automatically approve and merge Dependabot PRs
queue_conditions:
- base~=master|integ-tests
- "#approved-reviews-by>=1"
- approved-reviews-by=@aws-actions/aws-ecs-devx
- -approved-reviews-by~=author
- status-success=Run Unit Tests
- status-success=Semantic Pull Request
- status-success=Analyze (javascript)

pull_request_rules:
- name: Automatically merge on CI success and review approval
conditions:
- label!=work-in-progress
- -title~=(WIP|wip)
- -merged
- -closed
- author!=dependabot[bot]
- base=master
- author=dependabot[bot]
- status-success=Run Unit Tests
- status-success=Semantic Pull Request
- status-success=Analyze (javascript)
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge)
- -merged
- -closed
merge_conditions: []
merge_method: squash
- name: default
queue_conditions:
- base~=master|integ-tests
- "#approved-reviews-by>=1"
- approved-reviews-by=@aws-actions/aws-ecs-devx
Expand All @@ -21,11 +38,14 @@ pull_request_rules:
- -merged
- -closed
- author!=dependabot[bot]
actions:
queue:
method: squash
name: default
merge_conditions:
# Conditions to get out of the queue (= merged)
- status-success=Run Unit Tests
- status-success=Semantic Pull Request
- status-success=Analyze (javascript)
merge_method: squash

pull_request_rules:
- name: Automatically approve and merge Dependabot PRs
conditions:
- base=master
Expand All @@ -40,6 +60,8 @@ pull_request_rules:
actions:
review:
type: APPROVE
- name: Automatically approve and merge Dependabot PRs + Automatically merge on
CI success and review approval
conditions: []
actions:
queue:
method: squash
name: default
Loading