Skip to content

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

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jan 7, 2025
Merged

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

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a27c3db
ci(mergify): upgrade configuration to current format
mergify[bot] Nov 28, 2024
1d359bf
Merge branch 'master' into mergify/configuration-deprecated-update
s3cube Dec 3, 2024
303e47e
Clean up mergify configuration update
dani-chmb Dec 23, 2024
aeb6bc5
Merge branch 'master' into mergify/configuration-deprecated-update
omkhegde Jan 7, 2025
8c205e1
Update package
omkhegde Jan 7, 2025
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
52 changes: 36 additions & 16 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- 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:
- name: duplicated default from Automatically merge on CI success and review approval
queue_conditions:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

queue_rules->queue_conditions logic is duplicated from thepull_request_rules -> conditions for the condition named "for "Automatically merge on CI success and review approval"

- base~=master|integ-tests
- "#approved-reviews-by>=1"
- approved-reviews-by=@aws-actions/aws-ecs-devx
Expand All @@ -21,11 +13,37 @@ pull_request_rules:
- -merged
- -closed
- author!=dependabot[bot]
actions:
queue:
method: squash
name: default
merge_conditions:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

queue_rules->merge_conditions replaces the oldqueue_rules "default" conditions logic

# 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
- name: duplicated default from Automatically approve and merge Dependabot PRs
queue_conditions:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, duplicated from pull_request_rules -> conditions for the condition named "Automatically approve and merge Dependabot PRs"

- 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:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicated 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
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- status-success=Run Unit Tests
- status-success=Semantic Pull Request
- status-success=Analyze (javascript)

pull_request_rules:
- name: Automatically approve and merge Dependabot PRs
conditions:
- base=master
Expand All @@ -40,6 +58,8 @@ pull_request_rules:
actions:
review:
type: APPROVE
- name: Automatically approve and merge Dependabot PRs + Automatically merge on
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step seems incomplete?

CI success and review approval
conditions: []
actions:
queue:
method: squash
name: default
Loading