From a634168cd85f9667ea7a7481b28c4027d8422478 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 1 Feb 2023 11:08:01 -0500 Subject: [PATCH 1/4] Rename CI steps/templates to match the more generic naming in flutter/packages --- .cirrus.yml | 24 ++++++++++--------- ...app.yaml => exclude_all_packages_app.yaml} | 0 2 files changed, 13 insertions(+), 11 deletions(-) rename script/configs/{exclude_all_plugins_app.yaml => exclude_all_packages_app.yaml} (100%) diff --git a/.cirrus.yml b/.cirrus.yml index 66a471020189..311cd4070ab3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -47,17 +47,19 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE - flutter doctor -v << : *TOOL_SETUP_TEMPLATE -build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE - create_all_plugins_app_script: - - $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml - build_all_plugins_debug_script: +# Ensures that the latest versions of all of the 1P packages can be used +# together. See script/configs/exclude_all_packages_app.yaml for exceptions. +build_all_packages_app_template: &BUILD_ALL_PACKAGES_APP_TEMPLATE + create_all_packages_app_script: + - $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml + build_all_packages_debug_script: - cd all_packages - if [[ "$BUILD_ALL_ARGS" == "web" ]]; then - echo "Skipping; web does not support debug builds" - else - flutter build $BUILD_ALL_ARGS --debug - fi - build_all_plugins_release_script: + build_all_packages_release_script: - cd all_packages - flutter build $BUILD_ALL_ARGS --release @@ -186,21 +188,21 @@ task: CIRRUS_CLONE_SUBMODULES: true script: ./script/tool_runner.sh update-excerpts --fail-on-change ### Web tasks ### - - name: web-build_all_plugins + - name: web-build_all_packages env: BUILD_ALL_ARGS: "web" matrix: CHANNEL: "master" CHANNEL: "stable" - << : *BUILD_ALL_PLUGINS_APP_TEMPLATE + << : *BUILD_ALL_PACKAGES_APP_TEMPLATE ### Linux desktop tasks ### - - name: linux-build_all_plugins + - name: linux-build_all_packages env: BUILD_ALL_ARGS: "linux" matrix: CHANNEL: "master" CHANNEL: "stable" - << : *BUILD_ALL_PLUGINS_APP_TEMPLATE + << : *BUILD_ALL_PACKAGES_APP_TEMPLATE - name: linux-platform_tests # Don't run full platform tests on both channels in pre-submit. skip: $CIRRUS_PR != '' && $CHANNEL == 'stable' @@ -268,13 +270,13 @@ task: path: "**/reports/lint-results-debug.xml" type: text/xml format: android-lint - - name: android-build_all_plugins + - name: android-build_all_packages env: BUILD_ALL_ARGS: "apk" matrix: CHANNEL: "master" CHANNEL: "stable" - << : *BUILD_ALL_PLUGINS_APP_TEMPLATE + << : *BUILD_ALL_PACKAGES_APP_TEMPLATE ### Web tasks ### - name: web-platform_tests env: diff --git a/script/configs/exclude_all_plugins_app.yaml b/script/configs/exclude_all_packages_app.yaml similarity index 100% rename from script/configs/exclude_all_plugins_app.yaml rename to script/configs/exclude_all_packages_app.yaml From e24e4e574722facc6ff0c4b329443d0343080f21 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 1 Feb 2023 11:13:20 -0500 Subject: [PATCH 2/4] Move Dart unit tests to heavy workload, matching flutter/packages --- .cirrus.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 311cd4070ab3..2536e35aa315 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -119,13 +119,6 @@ task: - else - echo "Only run in presubmit" - fi - - name: dart_unit_tests - env: - matrix: - CHANNEL: "master" - CHANNEL: "stable" - unit_test_script: - - ./script/tool_runner.sh test - name: analyze env: matrix: @@ -232,6 +225,14 @@ task: cpu: 4 memory: 16G matrix: + ### Platform-agnostic tasks ### + - name: dart_unit_tests + env: + matrix: + CHANNEL: "master" + CHANNEL: "stable" + unit_test_script: + - ./script/tool_runner.sh test ### Android tasks ### - name: android-platform_tests # Don't run full platform tests on both channels in pre-submit. From 5e74f00c396f5937fa2f6a9c2973d1e21780ef60 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 1 Feb 2023 14:04:16 -0500 Subject: [PATCH 3/4] Tweak outdated comment --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2536e35aa315..8d659c3d72aa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -254,7 +254,7 @@ task: lint_script: - ./script/tool_runner.sh lint-android # must come after build-examples native_unit_test_script: - # Native integration tests are handled by firebase-test-lab below, so + # Native integration tests are handled by Firebase Test Lab below, so # only run unit tests. # Must come after build-examples. - ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml From 4b6345684b3d1046473455aa23e21152fcdc8be6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 1 Feb 2023 14:19:18 -0500 Subject: [PATCH 4/4] Update LUCI script reference to moved file --- .ci/scripts/create_all_plugins_app.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/create_all_plugins_app.sh b/.ci/scripts/create_all_plugins_app.sh index 100e8aca804a..8399e5e38a35 100644 --- a/.ci/scripts/create_all_plugins_app.sh +++ b/.ci/scripts/create_all_plugins_app.sh @@ -4,4 +4,4 @@ # found in the LICENSE file. dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \ - --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml + --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml