Skip to content

Commit 2e84965

Browse files
authored
[ci] Fix and standardize target/task names (flutter#4323)
Fixes the target names in LUCI to not use '+', since it's not supported. To better align the names between the two different infrastructures, also updates the task naming in cirrus.yml to not use +. It also standardizes the naming form across both systems as: `<Host platform> <target platform>-<test_name> <extra info>` where: - `<Host platform>` is always there on LUCI, where required, but only added where it's potentially ambiguous on Cirrus. - `<target platform>' is omitted when the test is not target-platform specific. - `<test_name>' uses underscores, which is consistent with flutter/flutter (and with Cirrus step naming). - `<extra info>` is only explicitly set (to the channel) on LUCI; Cirrus automatically adds channel info there due to the way `matrix` works.
1 parent 9848181 commit 2e84965

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.ci.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ targets:
6262
]
6363
scheduler: luci
6464

65-
- name: Windows win32_build+platform-tests master
65+
- name: Windows win32-platform_tests master
6666
recipe: plugins/plugins
6767
bringup: true
6868
timeout: 30
@@ -76,22 +76,22 @@ targets:
7676
]
7777
scheduler: luci
7878

79-
- name: Windows win32_build+platform-tests stable
79+
- name: Windows win32-platform_tests stable
8080
recipe: plugins/plugins
8181
bringup: true
8282
timeout: 30
8383
properties:
8484
# TODO(stuartmorgan): Uncomment when removing bringup.
8585
#add_recipes_cq: "true"
86-
target_file: uwp_build_and_platform_tests.yaml
86+
target_file: windows_build_and_platform_tests.yaml
8787
channel: stable
8888
dependencies: >
8989
[
9090
{"dependency": "vs_build"}
9191
]
9292
scheduler: luci
9393

94-
- name: Windows build_all_plugins master
94+
- name: Windows windows-build_all_plugins master
9595
recipe: plugins/plugins
9696
bringup: true
9797
timeout: 30
@@ -105,7 +105,7 @@ targets:
105105
]
106106
scheduler: luci
107107

108-
- name: Windows build_all_plugins stable
108+
- name: Windows windows-build_all_plugins stable
109109
recipe: plugins/plugins
110110
bringup: true
111111
timeout: 30
@@ -120,7 +120,7 @@ targets:
120120
]
121121
scheduler: luci
122122

123-
- name: Windows uwp-build+platform-tests master
123+
- name: Windows uwp-platform_tests master
124124
recipe: plugins/plugins
125125
bringup: true
126126
timeout: 30

.cirrus.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ task:
6363
namespace: default
6464
matrix:
6565
### Platform-agnostic tasks ###
66-
- name: plugin_tools_tests
66+
- name: Linux plugin_tools_tests
6767
script:
6868
- cd script/tool
6969
- dart pub run test
@@ -74,7 +74,7 @@ task:
7474
format_script: ./script/tool_runner.sh format --fail-on-change
7575
pubspec_script: ./script/tool_runner.sh pubspec-check
7676
license_script: dart $PLUGIN_TOOL license-check
77-
- name: test
77+
- name: dart_unit_tests
7878
env:
7979
matrix:
8080
CHANNEL: "master"
@@ -94,23 +94,23 @@ task:
9494
# See the comment in script/configs/custom_analysis.yaml for details.
9595
- ./script/tool_runner.sh analyze --custom-analysis=script/configs/custom_analysis.yaml
9696
### Android tasks ###
97-
- name: build_all_plugins_apk
97+
- name: android-build_all_plugins
9898
env:
9999
BUILD_ALL_ARGS: "apk"
100100
matrix:
101101
CHANNEL: "master"
102102
CHANNEL: "stable"
103103
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
104104
### Web tasks ###
105-
- name: build_all_plugins_web
105+
- name: web-build_all_plugins
106106
env:
107107
BUILD_ALL_ARGS: "web"
108108
matrix:
109109
CHANNEL: "master"
110110
CHANNEL: "stable"
111111
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
112112
### Linux desktop tasks ###
113-
- name: build_all_plugins_linux
113+
- name: linux-build_all_plugins
114114
env:
115115
BUILD_ALL_ARGS: "linux"
116116
matrix:
@@ -119,7 +119,7 @@ task:
119119
setup_script:
120120
- flutter config --enable-linux-desktop
121121
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
122-
- name: linux-build+platform-tests
122+
- name: linux-platform_tests
123123
env:
124124
matrix:
125125
CHANNEL: "master"
@@ -148,7 +148,7 @@ task:
148148
memory: 12G
149149
matrix:
150150
### Android tasks ###
151-
- name: android-build+platform-tests
151+
- name: android-platform_tests
152152
env:
153153
matrix:
154154
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
@@ -202,7 +202,7 @@ task:
202202
type: text/xml
203203
format: android-lint
204204
### Web tasks ###
205-
- name: web-build+platform-tests
205+
- name: web-platform_tests
206206
env:
207207
matrix:
208208
CHANNEL: "master"
@@ -224,18 +224,18 @@ task:
224224
<< : *FLUTTER_UPGRADE_TEMPLATE
225225
matrix:
226226
### iOS+macOS tasks ***
227-
- name: lint_darwin_plugins
227+
- name: darwin-lint_podspecs
228228
script:
229229
- ./script/tool_runner.sh podspecs
230230
### iOS tasks ###
231-
- name: build_all_plugins_ipa
231+
- name: ios-build_all_plugins
232232
env:
233233
BUILD_ALL_ARGS: "ios --no-codesign"
234234
matrix:
235235
CHANNEL: "master"
236236
CHANNEL: "stable"
237237
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
238-
- name: ios-build+platform-tests
238+
- name: ios-platform_tests
239239
env:
240240
PATH: $PATH:/usr/local/bin
241241
matrix:
@@ -262,7 +262,7 @@ task:
262262
# So we run `drive-examples` after `native-test`; changing the order will result ci failure.
263263
- ./script/tool_runner.sh drive-examples --ios --exclude=script/configs/exclude_integration_ios.yaml
264264
### macOS desktop tasks ###
265-
- name: build_all_plugins_macos
265+
- name: macos-build_all_plugins
266266
env:
267267
BUILD_ALL_ARGS: "macos"
268268
matrix:
@@ -271,7 +271,7 @@ task:
271271
setup_script:
272272
- flutter config --enable-macos-desktop
273273
<< : *BUILD_ALL_PLUGINS_APP_TEMPLATE
274-
- name: macos-build+platform-tests
274+
- name: macos-platform_tests
275275
env:
276276
matrix:
277277
CHANNEL: "master"

0 commit comments

Comments
 (0)