Skip to content

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

Merged
auto-submit[bot] merged 3 commits into
flutter:mainfrom
matanlurey:merge-queue-guy
May 15, 2025
Merged

Conditionally lock MQG on flutter/flutter+master only.#4685
auto-submit[bot] merged 3 commits into
flutter:mainfrom
matanlurey:merge-queue-guy

Conversation

@matanlurey
Copy link
Copy Markdown
Contributor

@matanlurey matanlurey commented May 14, 2025

@matanlurey matanlurey requested a review from jtmcdole May 14, 2025 21:29
@jtmcdole jtmcdole requested a review from yjbanov May 15, 2025 16:35
jtmcdole
jtmcdole approved these changes May 15, 2025
View reviewed changes
Copy link
Copy Markdown
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.

Comment thread app_dart/lib/src/service/scheduler.dart Outdated
final lock = await lockMergeGroupChecks(slug, pullRequest.head!.sha!);
final CheckRun? lock;
{
if (!isFusion) {
Copy link
Copy Markdown
Member

@jtmcdole jtmcdole May 15, 2025

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
Copy Markdown
Contributor Author

@matanlurey matanlurey May 15, 2025

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 mentioned this pull request May 16, 2025
Closed
@matanlurey matanlurey added the revert Label used to revert changes in a closed and merged pull request. label May 16, 2025
@auto-submit
Copy link
Copy Markdown
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
Copy Markdown
Contributor Author

matanlurey commented May 16, 2025

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
Revert "Conditionally lock MQG on flutter/flutter+master only. (#…
2090128 
…4685)"

This reverts commit dd59cbb.
@auto-submit auto-submit Bot mentioned this pull request May 16, 2025
Merged
@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
@auto-submit
Reverts "Conditionally lock MQG on flutter/flutter+master only. (#…
fe84d6f 
…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

Reviewers

@jtmcdole jtmcdole jtmcdole approved these changes

@yjbanov yjbanov Awaiting requested review from yjbanov

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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

2 participants

@matanlurey @jtmcdole