[ci] refactor: Cleanup tooling for handling arch build output <= Flutter v3.13.x (#11399)

Gustl22 · web-flow · commit 4a6a44421806 · 2026-05-11T15:24:09.000Z
There remained some code, which was left in to support build output for Flutter <= v3.16.x (see: flutter/flutter@792e26d) As the minimum supported Flutter version is 3.35.x as of https://github.com/flutter/packages/blob/eab1265529a0fe75e1f800ecf96c5012be155942/.ci/targets/repo_checks.yaml#L31 we can remove the special handling for versions prior v3.16.x. Contributes to flutter/flutter#129807 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart
@@ -409,6 +409,15 @@ Future<int> _runLinuxUnitTests({bool ciMode = false}) async {
     return compileCode;
   }
 
+  // Depending on the Flutter version, the build output path may be different.
+  // To handle both master and stable, and to future-proof against the changes
+  // that will happen in https://github.com/flutter/flutter/issues/114349
+  // - Try arm64, to future-proof against arm64 support.
+  // - Try x64, to cover pre-arm64 support on arm64 hosts, as well as x64 hosts.
+  // TODO(gustl22): Remove all this when these tests no longer need to
+  // support a version of Flutter without
+  // https://github.com/flutter/flutter/issues/114349, and just construct the
+  // version of the path with the current architecture.
   const buildDirBase = '$examplePath/build/linux';
   const buildRelativeBinaryPath = 'debug/plugins/test_plugin/test_plugin_test';
   const arm64Path = '$buildDirBase/arm64/$buildRelativeBinaryPath';
diff --git a/script/tool/lib/src/common/cmake.dart b/script/tool/lib/src/common/cmake.dart
@@ -20,7 +20,7 @@ class CMakeProject {
     required this.buildMode,
     this.processRunner = const ProcessRunner(),
     this.platform = const LocalPlatform(),
-    this.arch,
+    required this.arch,
   });
 
   /// The directory of a Flutter project to run Gradle commands in.
@@ -33,13 +33,11 @@ class CMakeProject {
   final Platform platform;
 
   /// The architecture subdirectory of the build.
-  // TODO(stuartmorgan): Make this non-nullable once Flutter 3.13 is no longer
-  // supported, since at that point there will always be a subdirectory.
-  final String? arch;
+  final String arch;
 
   /// The build mode (e.g., Debug, Release).
   ///
-  /// This is a constructor paramater because on Linux many properties depend
+  /// This is a constructor parameter because on Linux many properties depend
   /// on the build mode since it uses a single-configuration generator.
   final String buildMode;
 
@@ -52,10 +50,8 @@ class CMakeProject {
   Directory get buildDirectory {
     Directory buildDir = flutterProject
         .childDirectory('build')
-        .childDirectory(_platformDirName);
-    if (arch != null) {
-      buildDir = buildDir.childDirectory(arch!);
-    }
+        .childDirectory(_platformDirName)
+        .childDirectory(arch);
     if (platform.isLinux) {
       // Linux uses a single-config generator, so the base build directory
       // includes the configuration.
diff --git a/script/tool/lib/src/native_test_command.dart b/script/tool/lib/src/native_test_command.dart
@@ -681,12 +681,25 @@ this command.
     const x64DirName = 'x64';
     const arm64DirName = 'arm64';
     if (platform.isWindows) {
-      arch = _abi == Abi.windowsX64 ? x64DirName : arm64DirName;
+      arch = switch (_abi) {
+        Abi.windowsX64 => x64DirName,
+        Abi.windowsArm64 => arm64DirName,
+        _ => null,
+      };
     } else if (platform.isLinux) {
       // TODO(stuartmorgan): Support arm64 if that ever becomes a supported
       // CI configuration for the repository.
-      arch = 'x64';
+      // See: https://github.com/flutter/flutter/issues/114349
+      arch = x64DirName;
+    }
+
+    if (arch == null) {
+      return _PlatformResult(
+        RunState.failed,
+        error: 'Google Test testing is not supported on $platform $_abi.',
+      );
     }
+
     for (final RepositoryPackage example in plugin.getExamples()) {
       var project = CMakeProject(
         example.directory,
@@ -695,32 +708,20 @@ this command.
         platform: platform,
         arch: arch,
       );
-      if (platform.isWindows) {
-        if (arch == arm64DirName && !project.isConfigured()) {
-          // Check for x64, to handle builds newer than 3.13, but that don't yet
-          // have https://github.com/flutter/flutter/issues/129807.
-          // TODO(stuartmorgan): Remove this when CI no longer supports a
-          // version of Flutter without the issue above fixed.
-          project = CMakeProject(
-            example.directory,
-            buildMode: buildMode,
-            processRunner: processRunner,
-            platform: platform,
-            arch: x64DirName,
-          );
-        }
-        if (!project.isConfigured()) {
-          // Check again without the arch subdirectory, since 3.13 doesn't
-          // have it yet.
-          // TODO(stuartmorgan): Remove this when CI no longer supports Flutter
-          // 3.13.
-          project = CMakeProject(
-            example.directory,
-            buildMode: buildMode,
-            processRunner: processRunner,
-            platform: platform,
-          );
-        }
+      if (platform.isWindows &&
+          arch == arm64DirName &&
+          !project.isConfigured()) {
+        // Check for x64, to handle builds that don't yet have
+        // https://github.com/flutter/flutter/issues/129807.
+        // TODO(stuartmorgan): Remove this when CI no longer supports a
+        // version of Flutter without the issue above fixed.
+        project = CMakeProject(
+          example.directory,
+          buildMode: buildMode,
+          processRunner: processRunner,
+          platform: platform,
+          arch: x64DirName,
+        );
       }
       if (!project.isConfigured()) {
         printError(
diff --git a/script/tool/test/native_test_command_test.dart b/script/tool/test/native_test_command_test.dart
@@ -68,7 +68,7 @@ const String _archDirArm64 = 'arm64';
 void _createFakeCMakeCache(
   RepositoryPackage plugin,
   Platform platform,
-  String? archDir,
+  String archDir,
 ) {
   final project = CMakeProject(
     getExampleDir(plugin),
@@ -2231,13 +2231,11 @@ public class FlutterActivityTest {
 
     // Returns the ProcessCall to expect for build the Windows unit tests for
     // the given plugin.
-    ProcessCall getWindowsBuildCall(RepositoryPackage plugin, String? arch) {
-      Directory projectDir = getExampleDir(
+    ProcessCall getWindowsBuildCall(RepositoryPackage plugin, String arch) {
+      final Directory projectDir = getExampleDir(
         plugin,
-      ).childDirectory('build').childDirectory('windows');
-      if (arch != null) {
-        projectDir = projectDir.childDirectory(arch);
-      }
+      ).childDirectory('build').childDirectory('windows').childDirectory(arch);
+
       return ProcessCall(_fakeCmakeCommand, <String>[
         '--build',
         projectDir.path,
@@ -2311,47 +2309,6 @@ public class FlutterActivityTest {
         );
       });
 
-      test('runs unit tests with legacy build output', () async {
-        const testBinaryRelativePath =
-            'build/windows/Debug/bar/plugin_test.exe';
-        final RepositoryPackage plugin = createFakePlugin(
-          'plugin',
-          packagesDir,
-          extraFiles: <String>['example/$testBinaryRelativePath'],
-          platformSupport: <String, PlatformDetails>{
-            platformWindows: const PlatformDetails(PlatformSupport.inline),
-          },
-        );
-        _createFakeCMakeCache(plugin, mockPlatform, null);
-
-        final File testBinary = childFileWithSubcomponents(
-          plugin.directory,
-          <String>['example', ...testBinaryRelativePath.split('/')],
-        );
-
-        final List<String> output = await runCapturingPrint(runner, <String>[
-          'native-test',
-          '--windows',
-          '--no-integration',
-        ]);
-
-        expect(
-          output,
-          containsAllInOrder(<Matcher>[
-            contains('Running plugin_test.exe...'),
-            contains('No issues found!'),
-          ]),
-        );
-
-        expect(
-          processRunner.recordedCalls,
-          orderedEquals(<ProcessCall>[
-            getWindowsBuildCall(plugin, null),
-            ProcessCall(testBinary.path, const <String>[], null),
-          ]),
-        );
-      });
-
       test('only runs debug unit tests', () async {
         const debugTestBinaryRelativePath =
             'build/windows/x64/Debug/bar/plugin_test.exe';
@@ -2398,52 +2355,6 @@ public class FlutterActivityTest {
         );
       });
 
-      test('only runs debug unit tests with legacy build output', () async {
-        const debugTestBinaryRelativePath =
-            'build/windows/Debug/bar/plugin_test.exe';
-        const releaseTestBinaryRelativePath =
-            'build/windows/Release/bar/plugin_test.exe';
-        final RepositoryPackage plugin = createFakePlugin(
-          'plugin',
-          packagesDir,
-          extraFiles: <String>[
-            'example/$debugTestBinaryRelativePath',
-            'example/$releaseTestBinaryRelativePath',
-          ],
-          platformSupport: <String, PlatformDetails>{
-            platformWindows: const PlatformDetails(PlatformSupport.inline),
-          },
-        );
-        _createFakeCMakeCache(plugin, mockPlatform, null);
-
-        final File debugTestBinary = childFileWithSubcomponents(
-          plugin.directory,
-          <String>['example', ...debugTestBinaryRelativePath.split('/')],
-        );
-
-        final List<String> output = await runCapturingPrint(runner, <String>[
-          'native-test',
-          '--windows',
-          '--no-integration',
-        ]);
-
-        expect(
-          output,
-          containsAllInOrder(<Matcher>[
-            contains('Running plugin_test.exe...'),
-            contains('No issues found!'),
-          ]),
-        );
-
-        expect(
-          processRunner.recordedCalls,
-          orderedEquals(<ProcessCall>[
-            getWindowsBuildCall(plugin, null),
-            ProcessCall(debugTestBinary.path, const <String>[], null),
-          ]),
-        );
-      });
-
       test('fails if CMake has not been configured', () async {
         createFakePlugin(
           'plugin',
