Skip to content

Commit c6f719d

Browse files
authored
Skip freeze check in the merge queue (flutter#184854)
`merge_group` events do not have the same GitHub API access as `pull_request_target`, so we should skip the check in the merge queue. We should skip the freeze check in the merge queue. The freeze workflow was enabled as a required check in the branch protections in order to capture existing PRs and prevent them from landing. This protection made the check required in the merge queue, but no way for it to handle it. After this lands, I can re-enable the branch protection. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent b31ab80 commit c6f719d

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/freeze.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
types: [opened, reopened, synchronize, ready_for_review, labeled, unlabeled]
1010
branches:
1111
- master
12+
merge_group:
13+
branches:
14+
- master
1215

1316
permissions: read-all
1417

@@ -20,6 +23,7 @@ jobs:
2023

2124
steps:
2225
- name: Check for changes in frozen folders
26+
if: github.event_name != 'merge_group'
2327
uses: dorny/paths-filter@v3
2428
id: filter
2529
with:
@@ -40,7 +44,7 @@ jobs:
4044
- 'packages/flutter/test_fixes/cupertino/**'
4145
4246
- name: Fail on frozen changes
43-
if: steps.filter.outputs.frozen == 'true' && !contains(github.event.pull_request.labels.*.name, 'override code freeze')
47+
if: github.event_name != 'merge_group' && steps.filter.outputs.frozen == 'true' && !contains(github.event.pull_request.labels.*.name, 'override code freeze')
4448
run: |
4549
echo "Error: Code changes detected during the current code freeze."
4650
echo "If this is a critical fix that must land, please file an issue for team-design."

0 commit comments

Comments
 (0)