[CP-beta]Check that the windows architecture is 64-bit and not the process architecture #174062
Conversation
…hitecture (flutter#174019) Changes the platform detection for Windows - so that it can be invoked from a 32-bit process when we are on a 64-bit system. This is the case for example 'make' for windows which only comes with a 32-bit version. _PROCESSOR_ARCHITEW6432_ is only set if the process architecture differs from the platform architecture. See https://learn.microsoft.com/de-de/windows/win32/winprog64/wow64-implementation-details#environment-variables Fixes flutter#174017 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] 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 `///`). - [ ] 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. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **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 [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 --------- Co-authored-by: Matan Lurey <matanlurey@users.noreply.github.com> Co-authored-by: Loïc Sharma <737941+loic-sharma@users.noreply.github.com>
|
@matanlurey please fill out the PR description above, afterwards the release team will review this request. |
|
This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter. Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed. |
There was a problem hiding this comment.
Code Review
This pull request aims to fix the Windows architecture check to correctly support running Flutter from a 32-bit process on a 64-bit OS. While the approach is correct, there's a critical typo in the environment variable name used for the check, which makes it ineffective. I've pointed this out along with a related typo in a comment. I also have a suggestion to improve the script's exit behavior to be more user-friendly on Windows.
| EXIT 1 | ||
| IF "%PROCESSOR_ARCHITEW6432%"=="" ( | ||
| ECHO Flutter requires 64-bit versions of Windows | ||
| EXIT 1 |
There was a problem hiding this comment.
Using EXIT 1 terminates the calling cmd.exe process, which can unexpectedly close a user's terminal. It's better practice to use EXIT /B 1, which exits only the current script and sets the ERRORLEVEL. This provides a better user experience and is more consistent with other checks in flutter.bat.
EXIT /B 1
|
autosubmit label was removed for flutter/flutter/174062, because - The status or check suite Linux analyze has failed. Please fix the issues identified (or deflake) before re-applying this label. |
…5fc3877792b583c313f74b1f
f31774c
into
flutter:flutter-3.36-candidate.0
This pull request is created by automatic cherry pick workflow
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.
Issue Link:
What is the link to the issue this cherry-pick is addressing?
#174017
Changelog Description:
Explain this cherry pick in one line that is accessible to most Flutter developers. See best practices for examples
Fixes an issue when running a 32-bit process on a 64-bit Windows system
Impact Description:
What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)
Cannot run
Workaround:
Is there a workaround for this issue?
No
Risk:
What is the risk level of this cherry-pick?
Test Coverage:
Are you confident that your fix is well-tested by automated tests?
Validation Steps:
What are the steps to validate that this fix works?
Trust the force.