Skip to content

Commit be76f03

Browse files
committed
Readd exception for arm64
1 parent cc2bb4d commit be76f03

1 file changed

Lines changed: 21 additions & 4 deletions

File tree

script/tool/lib/src/native_test_command.dart

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,17 +678,19 @@ this command.
678678
var hasMissingBuild = false;
679679
var buildFailed = false;
680680
String? arch;
681+
const x64DirName = 'x64';
682+
const arm64DirName = 'arm64';
681683
if (platform.isWindows) {
682684
arch = switch (_abi) {
683-
Abi.windowsX64 => 'x64',
684-
Abi.windowsArm64 => 'arm64',
685+
Abi.windowsX64 => x64DirName,
686+
Abi.windowsArm64 => arm64DirName,
685687
_ => null,
686688
};
687689
} else if (platform.isLinux) {
688690
// TODO(stuartmorgan): Support arm64 if that ever becomes a supported
689691
// CI configuration for the repository.
690692
// See: https://github.com/flutter/flutter/issues/114349
691-
arch = 'x64';
693+
arch = x64DirName;
692694
}
693695

694696
if (arch == null) {
@@ -700,13 +702,28 @@ this command.
700702
}
701703

702704
for (final RepositoryPackage example in plugin.getExamples()) {
703-
final project = CMakeProject(
705+
var project = CMakeProject(
704706
example.directory,
705707
buildMode: buildMode,
706708
processRunner: processRunner,
707709
platform: platform,
708710
arch: arch,
709711
);
712+
if (platform.isWindows &&
713+
arch == arm64DirName &&
714+
!project.isConfigured()) {
715+
// Check for x64, to handle builds that don't yet have
716+
// https://github.com/flutter/flutter/issues/129807.
717+
// TODO(stuartmorgan): Remove this when CI no longer supports a
718+
// version of Flutter without the issue above fixed.
719+
project = CMakeProject(
720+
example.directory,
721+
buildMode: buildMode,
722+
processRunner: processRunner,
723+
platform: platform,
724+
arch: x64DirName,
725+
);
726+
}
710727
if (!project.isConfigured()) {
711728
printError(
712729
'ERROR: Run "flutter build" on ${example.displayName}, '

0 commit comments

Comments
 (0)