-
Notifications
You must be signed in to change notification settings - Fork 6k
[ci] use env for format and support arm64 hosts #56268
[ci] use env for format and support arm64 hosts #56268
Conversation
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group. |
|
Unsure of how to do testing, do we need additional testing to ensure the new logic is working or would we just need to run it on ARM64 systems? |
ci/bin/format.dart
Outdated
| clangOs = Abi.current().toString().replaceFirst('_', '-'); | ||
| } else if (Platform.isMacOS) { | ||
| clangOs = 'mac-x64'; | ||
| clangOs = 'mac-${Abi.current().toString().split('_')[1]}'; | ||
| } else if (Platform.isWindows) { | ||
| clangOs = 'windows-x64'; | ||
| clangOs = Abi.current().toString().replaceFirst('_', '-'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer if we had specified strings for each binary rather than processing the ABI string.
if (ABI.current() == Abi.macosx64) {
clangOs = 'mac-amd64'; //
} else {
//
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alright, I've switched over to using that.
ae95170 to
2c747ca
Compare
|
Is progress being made on this? The linked CI failures may be related to analysis. |
I've been busy + waiting for reviews.
Didn't see that until now, didn't know CI failed. I'll try updating it tonight to fix it. |
2c747ca to
4cce5bd
Compare
jonahwilliams
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…159694) flutter/engine@e0900f8...05fdaa6 2024-12-02 [email protected] Roll Skia from d7751d3d6ff4 to 2c4ce1d953ba (5 revisions) (flutter/engine#56901) 2024-12-02 [email protected] [ci] use env for format and support arm64 hosts (flutter/engine#56268) 2024-12-02 [email protected] Replace outdated wiki URLs in pull request template (flutter/engine#56824) 2024-12-02 [email protected] [impeller] makes UniformBindData 15% faster and adds unit test (flutter/engine#56844) 2024-12-02 [email protected] Roll Skia from dd70c8e1c38f to d7751d3d6ff4 (36 revisions) (flutter/engine#56898) 2024-12-02 [email protected] Roll Dart SDK from 5785058c9bb1 to 46630dbefbbd (12 revisions) (flutter/engine#56897) 2024-12-02 [email protected] switched reactor to absl::flat_hash_map (flutter/engine#56845) 2024-12-02 [email protected] Sped up SubpixelGlyph::Equal (flutter/engine#56851) 2024-12-02 [email protected] [Impeller] dont cache glyph layout if atlas is invalid. (flutter/engine#56879) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Fixes running x64 binaries on arm64 hosts, this fixes systems like Raspberry Pi's, Apple Silicon, and Ampere. Before, I would get something like: ``` Checking GN formatting... Completed checking 0 GN files with no formatting problems. Checking Java formatting... No Java files with changes, skipping Java format check. Checking Python formatting... All python files formatted correctly. Checking for trailing whitespace on 1 source file... No trailing whitespace found. No header files with changes, skipping header guard check. Checking C++/ObjC/Shader formatting... ERROR: Formatter command '/home/ross/flutter-engine/src/flutter/buildtools/linux-x64/clang/bin/clang-format --style=file shell/platform/linux/fl_application_test.cc' failed with exit code 255. Command output follows: qemu-x86_64: Could not open '/lib64/ld-linux-x86-64.so.2': No such file or directory Completed checking 0 C++/ObjC/Shader files with no formatting problems ``` Now it just works, I also changed the shell script to use env since `/bin/bash` doesn't exist on NixOS so using env is a more portable solution. *List which issues are fixed by this PR. You must list at least one issue.* *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
Fixes running x64 binaries on arm64 hosts, this fixes systems like Raspberry Pi's, Apple Silicon, and Ampere.
Before, I would get something like:
Now it just works, I also changed the shell script to use env since
/bin/bashdoesn't exist on NixOS so using env is a more portable solution.List which issues are fixed by this PR. You must list at least one issue.
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
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.