Sitelet https://github.com/flutter/flutter/pull/189470
Skip to content

Move tool host_cross_arch tests into different shards - #189470

Merged
auto-submit[bot] merged 7 commits into
flutter:masterfrom
jmagman:host_cross_arch
Jul 27, 2026
Merged

auto-submit[bot] merged 7 commits into
flutter:masterfrom
jmagman:host_cross_arch

Conversation

@jmagman

@jmagman jmagman commented Jul 14, 2026

Copy link
Copy Markdown
Member

The intention of the tool_host_cross_arch_tests shard was to run architecture-specific tests that should be run on ARM and Intel. Since we are deprecating Intel Macs and they will only be run on one architecture, ARM, remove the shard entirely.

Keep the builder and test runner around as a no-op so nothing breaks in releases. We can remove them totally (builder, TESTOWNER, test runner, etc) once this code reaches stable.

#188328
First part of #189302

Pre-launch Checklist

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. 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.

@jmagman jmagman self-assigned this Jul 14, 2026
@jmagman jmagman added the CICD Run CI/CD label Jul 14, 2026
@github-actions github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Jul 14, 2026
@jmagman
jmagman marked this pull request as ready for review July 15, 2026 00:06
@jmagman
jmagman requested review from a team as code owners July 15, 2026 00:06

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request disables the _runToolHostCrossArchTests runner in dev/bots/test.dart and updates .ci.yaml to restrict the corresponding target to beta and stable branches. Additionally, it moves the macOS content validation tests to macos_content_validation_test.dart and the Dart binary architecture verification test to cache_test.dart. Feedback on the changes suggests using triple-slash documentation comments (///) in accordance with the style guide, and correcting the _identifyMacBinaryArch helper function to utilize its path parameter instead of referencing a global variable.

Comment thread packages/flutter_tools/test/integration.shard/cache_test.dart
Comment thread packages/flutter_tools/test/integration.shard/cache_test.dart Outdated
@@ -0,0 +1,309 @@
// Copyright 2014 The Flutter Authors. All rights reserved.

@jmagman jmagman Jul 15, 2026 •

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was moved, the only change is that I added skip: !platform.isMacOS since it was failing on Windows. This matches what ios_content_validation_test does.

skip: !platform.isMacOS, // [intended] only makes sense for macos platform.

@jmagman
jmagman requested a review from okorohelijah July 16, 2026 21:48
okorohelijah
okorohelijah previously approved these changes Jul 21, 2026

@okorohelijah okorohelijah left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

cbracken
cbracken previously approved these changes Jul 21, 2026

@cbracken cbracken left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm -- just two nits. Sorry this took so long for me to get to!

LGTM stamp from a Japanese personal seal

import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/build_info.dart';

import '../integration.shard/test_utils.dart';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can just be test_utils.dart since this is in integration.shard.

Same thing for ios_content_validation_test.dart I bet since it just shows as a pure rename.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

});

for (final buildMode in <BuildMode>[BuildMode.debug, BuildMode.profile, BuildMode.release]) {
test('verify ${buildMode.cliName} FlutterMacOS.xcframework artifact', () {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and below: could these be testWithoutContext()?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually you're right. Usually integration tests need a context, but all that work is happening in setUp so I think the tests themselves don't need a context.

@jmagman
jmagman dismissed stale reviews from cbracken and okorohelijah via 879fcec July 22, 2026 19:34
@jmagman
jmagman requested review from cbracken and okorohelijah July 24, 2026 18:53
@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 27, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Jul 27, 2026
Merged via the queue into flutter:master with commit 2b4b705 Jul 27, 2026
20 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 27, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Jul 28, 2026
flutter/flutter@9988960...0f02463

2026-07-28 engine-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from E8hJ1AfK8CtGtaES0... to 1frGe_KltAJKkeyPg... (flutter/flutter#190134)
2026-07-28 chris@bracken.jp iOS: Reject merged-platform-ui-thread=mergeAfterLaunch (flutter/flutter#190051)
2026-07-28 chris@bracken.jp iOS: Migrate TaskRunner tests to Swift Testing (flutter/flutter#190055)
2026-07-28 magder@google.com Run Mac golden tests on ARM bots (flutter/flutter#189465)
2026-07-28 chris@bracken.jp iOS,macOS: Rename Swift test files to end in Tests.swift (flutter/flutter#190063)
2026-07-28 34871572+gmackall@users.noreply.github.com Fix hcpp cliprect being behind by 1 frame when scrolling (flutter/flutter#189946)
2026-07-28 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from vpboK5fPPIoFteqRq... to OZkZC_2CZ_G5rbMIS... (flutter/flutter#190115)
2026-07-27 ishaquehassan@gmail.com Add Ishaq Hassan to AUTHORS (flutter/flutter#190064)
2026-07-27 30870216+gaaclarke@users.noreply.github.com [wimp] fixes ubo padding size issue (flutter/flutter#189958)
2026-07-27 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#189872)
2026-07-27 magder@google.com Move tool host_cross_arch tests into different shards (flutter/flutter#189470)
2026-07-27 49699333+dependabot[bot]@users.noreply.github.com Bump actions/labeler from 6.2.0 to 7.0.0 in the all-github-actions group (flutter/flutter#190099)
2026-07-27 41930132+hellohuanlin@users.noreply.github.com [ios]do not nuke user input path when running uiscene integration test (flutter/flutter#186436)
2026-07-27 codefu@google.com ci: verify_binaries_pre_codesigned part 2 (flutter/flutter#190078)
2026-07-27 jason-simmons@users.noreply.github.com Roll Abseil to ff6e8ce3e932 (flutter/flutter#189998)
2026-07-27 awolff@google.com Android_hardware_smoke_test: clean up golden copy in CI (flutter/flutter#189948)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD team-ios Owned by iOS platform team team-macos Owned by the macOS platform team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants