From f5173c3fbf43b597a7f14cb000bf53947245bcb7 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 13:32:09 -0500 Subject: [PATCH 1/7] Move iOS Swift unit tests back to Cirrus, as they are hanging frequently on LUCI --- packages/pigeon/tool/run_tests.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index 14ff2cf7d7f..dab54247a30 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -49,7 +49,6 @@ Future main(List args) async { // separation. See https://github.com/flutter/flutter/issues/120231. const List macOSHostLuciTests = [ iOSObjCUnitTests, - iOSSwiftUnitTests, // TODO(stuartmorgan): Enable by default once CI issues are solved; see // https://github.com/flutter/packages/pull/2816. //iOSObjCIntegrationTests, @@ -60,6 +59,7 @@ Future main(List args) async { // iOSSwiftIntegrationTests, ]; const List macOSHostCirrusTests = [ + iOSSwiftUnitTests, macOSSwiftUnitTests, macOSSwiftIntegrationTests, ]; From f785e458acd3b0e03ca229502442cd225c1a42c7 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 13:48:00 -0500 Subject: [PATCH 2/7] Bump target device --- packages/pigeon/tool/shared/test_suites.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index a62b70ba9c8..a70658c9eb2 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -303,7 +303,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { return runXcodeBuild( '$examplePath/ios', sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 8', + destination: 'platform=iOS Simulator,name=iPhone 14', extraArguments: ['test'], ); } From 994ea8d272db0e28d2e34a0f1072a6c47140ed77 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 13:48:19 -0500 Subject: [PATCH 3/7] Try LUCI too, just to see if that was the issue --- packages/pigeon/tool/run_tests.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index dab54247a30..f2eb78f0ad2 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -49,6 +49,7 @@ Future main(List args) async { // separation. See https://github.com/flutter/flutter/issues/120231. const List macOSHostLuciTests = [ iOSObjCUnitTests, + iOSSwiftUnitTests, // TODO(stuartmorgan): Enable by default once CI issues are solved; see // https://github.com/flutter/packages/pull/2816. //iOSObjCIntegrationTests, From 9caef80036c8cecdc5addb444993db07239f767d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 13:56:32 -0500 Subject: [PATCH 4/7] Create a simulator rather than relying on the right one being there --- .cirrus.yml | 2 ++ packages/pigeon/tool/shared/test_suites.dart | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8142aae22ae..900c974ba22 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -340,6 +340,8 @@ task: matrix: CHANNEL: "master" CHANNEL: "stable" + create_simulator_script: + - .ci/scripts/create_simulator.sh local_tests_script: # script/configs/linux_only_custom_test.yaml # Custom tests need Chrome for these packages. (They run in linux-custom_package_tests) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index a70658c9eb2..8982f8f85a2 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -303,7 +303,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { return runXcodeBuild( '$examplePath/ios', sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 14', + destination: 'platform=iOS Simulator,name=iPhone 13', extraArguments: ['test'], ); } From b9320f8b7361167f8745bc703ba4980a852d3b0e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 14:00:21 -0500 Subject: [PATCH 5/7] Fix script permissions --- .ci/scripts/build_all_packages_app.sh | 0 .ci/scripts/create_all_packages_app.sh | 0 .ci/scripts/create_simulator.sh | 0 .ci/scripts/dart_unit_tests_win32.sh | 0 .ci/scripts/drive_examples_win32.sh | 0 .ci/scripts/plugin_tools_tests.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .ci/scripts/build_all_packages_app.sh mode change 100644 => 100755 .ci/scripts/create_all_packages_app.sh mode change 100644 => 100755 .ci/scripts/create_simulator.sh mode change 100644 => 100755 .ci/scripts/dart_unit_tests_win32.sh mode change 100644 => 100755 .ci/scripts/drive_examples_win32.sh mode change 100644 => 100755 .ci/scripts/plugin_tools_tests.sh diff --git a/.ci/scripts/build_all_packages_app.sh b/.ci/scripts/build_all_packages_app.sh old mode 100644 new mode 100755 diff --git a/.ci/scripts/create_all_packages_app.sh b/.ci/scripts/create_all_packages_app.sh old mode 100644 new mode 100755 diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh old mode 100644 new mode 100755 diff --git a/.ci/scripts/dart_unit_tests_win32.sh b/.ci/scripts/dart_unit_tests_win32.sh old mode 100644 new mode 100755 diff --git a/.ci/scripts/drive_examples_win32.sh b/.ci/scripts/drive_examples_win32.sh old mode 100644 new mode 100755 diff --git a/.ci/scripts/plugin_tools_tests.sh b/.ci/scripts/plugin_tools_tests.sh old mode 100644 new mode 100755 From ccc9654381d950386bbeb1d14a45fe7c8673a92c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 14:23:13 -0500 Subject: [PATCH 6/7] Use a simulator that's available on Cirrus --- packages/pigeon/tool/run_tests.dart | 1 - packages/pigeon/tool/shared/test_suites.dart | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index f2eb78f0ad2..dab54247a30 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -49,7 +49,6 @@ Future main(List args) async { // separation. See https://github.com/flutter/flutter/issues/120231. const List macOSHostLuciTests = [ iOSObjCUnitTests, - iOSSwiftUnitTests, // TODO(stuartmorgan): Enable by default once CI issues are solved; see // https://github.com/flutter/packages/pull/2816. //iOSObjCIntegrationTests, diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index 8982f8f85a2..a70658c9eb2 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -303,7 +303,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { return runXcodeBuild( '$examplePath/ios', sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 13', + destination: 'platform=iOS Simulator,name=iPhone 14', extraArguments: ['test'], ); } From 4a6684f458cdcc13af3ab04690aeb841c7e481e2 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 Feb 2023 16:06:21 -0500 Subject: [PATCH 7/7] Try to make both Cirrus and LUCI happy --- .cirrus.yml | 5 ++++- packages/pigeon/tool/shared/test_suites.dart | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 900c974ba22..4f6cf53b7aa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -340,8 +340,11 @@ task: matrix: CHANNEL: "master" CHANNEL: "stable" + # Create an iPhone 13, to match what is available on LUCI, since Pigeon tests + # currently have a hard-coded device. create_simulator_script: - - .ci/scripts/create_simulator.sh + - xcrun simctl list + - xcrun simctl create "iPhone 13" com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-16-0 local_tests_script: # script/configs/linux_only_custom_test.yaml # Custom tests need Chrome for these packages. (They run in linux-custom_package_tests) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index a70658c9eb2..8982f8f85a2 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -303,7 +303,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { return runXcodeBuild( '$examplePath/ios', sdk: 'iphonesimulator', - destination: 'platform=iOS Simulator,name=iPhone 14', + destination: 'platform=iOS Simulator,name=iPhone 13', extraArguments: ['test'], ); }