Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 9302d87

Browse files
[ci] More cirrus.yml pre-alignment with flutter/packages (#7079)
* Rename CI steps/templates to match the more generic naming in flutter/packages * Move Dart unit tests to heavy workload, matching flutter/packages * Tweak outdated comment * Update LUCI script reference to moved file
1 parent 1d4570b commit 9302d87

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

.ci/scripts/create_all_plugins_app.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# found in the LICENSE file.
55

66
dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
7-
--output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
7+
--output-dir=. --exclude script/configs/exclude_all_packages_app.yaml

.cirrus.yml

+22-19
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,19 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
4747
- flutter doctor -v
4848
<< : *TOOL_SETUP_TEMPLATE
4949

50-
build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE
51-
create_all_plugins_app_script:
52-
- $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
53-
build_all_plugins_debug_script:
50+
# Ensures that the latest versions of all of the 1P packages can be used
51+
# together. See script/configs/exclude_all_packages_app.yaml for exceptions.
52+
build_all_packages_app_template: &BUILD_ALL_PACKAGES_APP_TEMPLATE
53+
create_all_packages_app_script:
54+
- $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml
55+
build_all_packages_debug_script:
5456
- cd all_packages
5557
- if [[ "$BUILD_ALL_ARGS" == "web" ]]; then
5658
- echo "Skipping; web does not support debug builds"
5759
- else
5860
- flutter build $BUILD_ALL_ARGS --debug
5961
- fi
60-
build_all_plugins_release_script:
62+
build_all_packages_release_script:
6163
- cd all_packages
6264
- flutter build $BUILD_ALL_ARGS --release
6365

@@ -117,13 +119,6 @@ task:
117119
- else
118120
- echo "Only run in presubmit"
119121
- fi
120-
- name: dart_unit_tests
121-
env:
122-
matrix:
123-
CHANNEL: "master"
124-
CHANNEL: "stable"
125-
unit_test_script:
126-
- ./script/tool_runner.sh test
127122
- name: analyze
128123
env:
129124
matrix:
@@ -186,21 +181,21 @@ task:
186181
CIRRUS_CLONE_SUBMODULES: true
187182
script: ./script/tool_runner.sh update-excerpts --fail-on-change
188183
### Web tasks ###
189-
- name: web-build_all_plugins
184+
- name: web-build_all_packages
190185
env:
191186
BUILD_ALL_ARGS: "web"
192187
matrix:
193188
CHANNEL: "master"
194189
CHANNEL: "stable"
195-
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
190+
<< : *BUILD_ALL_PACKAGES_APP_TEMPLATE
196191
### Linux desktop tasks ###
197-
- name: linux-build_all_plugins
192+
- name: linux-build_all_packages
198193
env:
199194
BUILD_ALL_ARGS: "linux"
200195
matrix:
201196
CHANNEL: "master"
202197
CHANNEL: "stable"
203-
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
198+
<< : *BUILD_ALL_PACKAGES_APP_TEMPLATE
204199
- name: linux-platform_tests
205200
# Don't run full platform tests on both channels in pre-submit.
206201
skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
@@ -230,6 +225,14 @@ task:
230225
cpu: 4
231226
memory: 16G
232227
matrix:
228+
### Platform-agnostic tasks ###
229+
- name: dart_unit_tests
230+
env:
231+
matrix:
232+
CHANNEL: "master"
233+
CHANNEL: "stable"
234+
unit_test_script:
235+
- ./script/tool_runner.sh test
233236
### Android tasks ###
234237
- name: android-platform_tests
235238
# Don't run full platform tests on both channels in pre-submit.
@@ -251,7 +254,7 @@ task:
251254
lint_script:
252255
- ./script/tool_runner.sh lint-android # must come after build-examples
253256
native_unit_test_script:
254-
# Native integration tests are handled by firebase-test-lab below, so
257+
# Native integration tests are handled by Firebase Test Lab below, so
255258
# only run unit tests.
256259
# Must come after build-examples.
257260
- ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml
@@ -268,13 +271,13 @@ task:
268271
path: "**/reports/lint-results-debug.xml"
269272
type: text/xml
270273
format: android-lint
271-
- name: android-build_all_plugins
274+
- name: android-build_all_packages
272275
env:
273276
BUILD_ALL_ARGS: "apk"
274277
matrix:
275278
CHANNEL: "master"
276279
CHANNEL: "stable"
277-
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
280+
<< : *BUILD_ALL_PACKAGES_APP_TEMPLATE
278281
### Web tasks ###
279282
- name: web-platform_tests
280283
env:

0 commit comments

Comments
 (0)