Skip to content

chore(mergify): force in place checks#35631

Merged
aemada-aws merged 1 commit intomainfrom
mergify/aemada-aws/config-update
Sep 30, 2025
Merged

chore(mergify): force in place checks#35631
aemada-aws merged 1 commit intomainfrom
mergify/aemada-aws/config-update

Conversation

@aemada-aws
Copy link
Copy Markdown
Contributor

@aemada-aws aemada-aws commented Sep 30, 2025

Issue # (if applicable)

Reason for this change

Mergify is failing to merge with the following message:

The branch protection setting Require branches to be up to date before merging is not compatible with draft PR checks. To keep this branch protection enabled, update your Mergify configuration to enable in-place checks: set merge_queue.max_parallel_checks: 1, set every queue rule batch_size: 1, and avoid two-step CI (make merge_conditions identical to queue_conditions). Otherwise, disable this branch protection.

See: https://github.com/aws/aws-cdk/pull/35616/checks?check_run_id=51597461858 for example

This is due to not properly configuring in place merges, which requires batch size 1 for all queue rules

Description of changes

added batch_size: 1 to all queue rules

Describe any new or updated permissions being added

None

Description of how you validated changes

No real way unless we try it out

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@github-actions github-actions bot added the p2 label Sep 30, 2025
@aws-cdk-automation aws-cdk-automation requested a review from a team September 30, 2025 13:41
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Sep 30, 2025
@aemada-aws aemada-aws force-pushed the mergify/aemada-aws/config-update branch from 5f5658c to 66fe7b5 Compare September 30, 2025 13:42
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

(This review is outdated)

@aemada-aws aemada-aws force-pushed the mergify/aemada-aws/config-update branch from 66fe7b5 to aaa8373 Compare September 30, 2025 13:43
@aemada-aws aemada-aws changed the title ci(Mergify): configuration update chore(mergify): force in place checks Sep 30, 2025
@aws-cdk-automation aws-cdk-automation dismissed their stale review September 30, 2025 13:43

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aemada-aws aemada-aws force-pushed the mergify/aemada-aws/config-update branch from aaa8373 to d19cce0 Compare September 30, 2025 13:45
@kumvprat
Copy link
Copy Markdown
Contributor

Default value for this seems to be 1 already.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 30, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

Signed-off-by: null <null>
@aemada-aws aemada-aws force-pushed the mergify/aemada-aws/config-update branch from d19cce0 to 695c52a Compare September 30, 2025 14:20
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 30, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aemada-aws aemada-aws merged commit 805de63 into main Sep 30, 2025
19 of 20 checks passed
@aemada-aws aemada-aws deleted the mergify/aemada-aws/config-update branch September 30, 2025 14:47
@github-actions
Copy link
Copy Markdown
Contributor

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 30, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

contribution/core This is a PR that came from AWS. p2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants