Skip to content

Conditionally lock MQG on flutter/flutter+master only. #4685

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.

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 3 commits into from
May 15, 2025

Conversation

matanlurey
Copy link
Contributor

@matanlurey matanlurey requested a review from jtmcdole May 14, 2025 21:29
@jtmcdole jtmcdole requested a review from yjbanov May 15, 2025 16:35
Copy link
Member

@jtmcdole jtmcdole left a comment

Choose a reason for hiding this comment

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

Given we only have one merge group (flutter/flutter/master) - this makes perfect sense to not randomly create this check_run.

I double checked the branch protections and master is the only one with MQG.

final lock = await lockMergeGroupChecks(slug, pullRequest.head!.sha!);
final CheckRun? lock;
{
if (!isFusion) {
Copy link
Member

Choose a reason for hiding this comment

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

I prefer more positive logic:
if (isFusion && Config.defaultBranch(slug) == pullRequest.head!.ref) {
lock = await _lckMergeGroupChecks(...);
} else {
log.debug('Skipping merge queue guard: not a merge group request; $slug / $ref');
lock = null;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App. label May 15, 2025
@auto-submit auto-submit bot merged commit dd59cbb into flutter:main May 15, 2025
17 checks passed
@matanlurey matanlurey added the revert Label used to revert changes in a closed and merged pull request. label May 16, 2025
Copy link
Contributor

auto-submit bot commented May 16, 2025

A reason for requesting a revert of flutter/cocoon/4685 could
not be found or the reason was not properly formatted. Begin a comment with 'Reason for revert:' to tell the bot why
this issue is being reverted.

@auto-submit auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label May 16, 2025
@matanlurey
Copy link
Contributor Author

reason for revert: Breaks Flutter CI progression from engine -> framework

@matanlurey matanlurey added the revert Label used to revert changes in a closed and merged pull request. label May 16, 2025
auto-submit bot pushed a commit that referenced this pull request May 16, 2025
@auto-submit auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label May 16, 2025
auto-submit bot added a commit that referenced this pull request May 16, 2025
…4685)" (#4691)

Reverts: #4685
Initiated by: matanlurey
Reason for reverting: Breaks Flutter CI progression from engine -> framework
Original PR Author: matanlurey

Reviewed By: {jtmcdole}

This change reverts the following previous change:
Closes flutter/flutter#168867.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Merge Queue Guard" shows up on experimental (non-master) branches
2 participants