Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 25, 2024
1 parent f0e3859 commit 1a76772
Showing 1 changed file with 33 additions and 13 deletions.
46 changes: 33 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
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

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
- -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 @@ -19,11 +35,13 @@ 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
merge_method: squash

pull_request_rules:
- name: Automatically approve and merge Dependabot PRs
conditions:
- base=master
Expand All @@ -37,6 +55,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

0 comments on commit 1a76772

Please sign in to comment.