Skip to content

Conversation

@aemada-aws
Copy link
Contributor

@aemada-aws aemada-aws commented Oct 2, 2025

Issue # (if applicable)

Closes #.

Reason for this change

The Mergify configuration currently uses the deprecated conditions key inside queue_rules.
Mergify now interprets conditions as merge_conditions, which unintentionally makes the setup a two-step CI.
This prevents in-place checks from working and causes conflicts with GitHub’s branch protection rule “Require branches to be up to date before merging.”

Response from Mergify team:

You still have a conditions key in your queue rules, which translate to merge_conditions since the conditions attribute is deprecated. Having merge_conditions in your queue rules makes it a 2-step CI.
You can see more details on inplace checks in our documentation: https://docs.mergify.com/merge-queue/parallel-checks/#inplace-checks-no-drafts

Description of changes

  • Updated all queue_rules entries to use queue_conditions instead of conditions.

Describe any new or updated permissions being added

N/A — no IAM changes required.

Description of how you validated changes

  • Only way to test is to merge it.

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 Oct 2, 2025
@aemada-aws aemada-aws changed the title Fix mergify place checks 2 ci(mergify): rename conditions to queue_conditions to fix in place checks Oct 2, 2025
@aws-cdk-automation aws-cdk-automation requested a review from a team October 2, 2025 14:58
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 2, 2025
@aemada-aws aemada-aws marked this pull request as ready for review October 2, 2025 14:59
@mergify
Copy link
Contributor

mergify bot commented Oct 2, 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 765a0d2 into aws:main Oct 2, 2025
42 of 43 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Oct 2, 2025

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 Oct 2, 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.

2 participants