Skip to content

Commit 2d573fe

Browse files
[ci] Finish migrating Pigeon tests to LUCI (flutter#3192)
Completes the migration of macOS CI tests to LUCI, since the Pigeon test issues in CI seems to be resolved now (likely due to the Xcode updates in CI). Fixes flutter#120231
1 parent b6798e9 commit 2d573fe

File tree

2 files changed

+3
-41
lines changed

2 files changed

+3
-41
lines changed

.cirrus.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ tool_setup_template: &TOOL_SETUP_TEMPLATE
2222
tool_setup_script:
2323
- .ci/scripts/prepare_tool.sh
2424

25-
macos_template: &MACOS_TEMPLATE
26-
# Only one macOS task can run in parallel without credits, so use them for
27-
# PRs on macOS.
28-
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
29-
macos_instance:
30-
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
31-
3225
flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
3326
upgrade_flutter_script:
3427
# Channels that are part of our normal test matrix use a pinned,
@@ -335,24 +328,3 @@ task:
335328
- cd ../..
336329
- flutter packages get
337330
- dart testing/web_benchmarks_test.dart
338-
339-
# macOS tasks.
340-
task:
341-
<< : *FLUTTER_UPGRADE_TEMPLATE
342-
<< : *MACOS_TEMPLATE
343-
matrix:
344-
- name: macos-custom_package_tests
345-
env:
346-
PATH: $PATH:/usr/local/bin
347-
matrix:
348-
CHANNEL: "master"
349-
CHANNEL: "stable"
350-
# Create an iPhone 13, to match what is available on LUCI, since Pigeon tests
351-
# currently have a hard-coded device.
352-
create_simulator_script:
353-
- xcrun simctl list
354-
- xcrun simctl create "iPhone 13" com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-16-4
355-
local_tests_script:
356-
# script/configs/linux_only_custom_test.yaml
357-
# Custom tests need Chrome for these packages. (They run in linux-custom_package_tests)
358-
- ./script/tool_runner.sh custom-test --exclude=script/configs/linux_only_custom_test.yaml

packages/pigeon/tool/run_tests.dart

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ Future<void> main(List<String> args) async {
119119
// androidJavaIntegrationTests,
120120
// androidKotlinIntegrationTests,
121121
];
122-
// Run macOS and iOS tests on macOS, since that's the only place they can run.
123-
// TODO(stuartmorgan): Move everything to LUCI, and eliminate the LUCI/Cirrus
124-
// separation. See https://github.com/flutter/flutter/issues/120231.
125-
const List<String> macOSHostLuciTests = <String>[
122+
const List<String> macOSHostTests = <String>[
126123
iOSObjCUnitTests,
127124
// TODO(stuartmorgan): Enable by default once CI issues are solved; see
128125
// https://github.com/flutter/packages/pull/2816.
@@ -132,8 +129,6 @@ Future<void> main(List<String> args) async {
132129
// should be enabled if any iOS-only tests are added (e.g., for a feature
133130
// not supported by macOS).
134131
// iOSSwiftIntegrationTests,
135-
];
136-
const List<String> macOSHostCirrusTests = <String>[
137132
iOSSwiftUnitTests,
138133
macOSSwiftUnitTests,
139134
macOSSwiftIntegrationTests,
@@ -146,8 +141,7 @@ Future<void> main(List<String> args) async {
146141

147142
_validateTestCoverage(<List<String>>[
148143
linuxHostTests,
149-
macOSHostLuciTests,
150-
macOSHostCirrusTests,
144+
macOSHostTests,
151145
windowsHostTests,
152146
// Tests that are deliberately not included in CI:
153147
<String>[
@@ -177,11 +171,7 @@ Future<void> main(List<String> args) async {
177171

178172
final List<String> testsToRun;
179173
if (Platform.isMacOS) {
180-
if (Platform.environment['LUCI_CI'] != null) {
181-
testsToRun = macOSHostLuciTests;
182-
} else {
183-
testsToRun = macOSHostCirrusTests;
184-
}
174+
testsToRun = macOSHostTests;
185175
} else if (Platform.isWindows) {
186176
testsToRun = windowsHostTests;
187177
} else if (Platform.isLinux) {

0 commit comments

Comments
 (0)