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

Commit 578f7f9

Browse files
zandersozanderso
committed
Make global builds uniquely named per platform
1 parent e96c18b commit 578f7f9

File tree

8 files changed

+163
-150
lines changed

8 files changed

+163
-150
lines changed

‎ci/builders/linux_android_emulator.json‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
"--android-cpu=x64",
1616
"--no-lto",
1717
"--rbe",
18-
"--no-goma"
18+
"--no-goma",
19+
"--target-dir",
20+
"android_emulator_debug_x64"
1921
],
2022
"dependencies": [
2123
{
2224
"dependency": "goldctl",
2325
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
2426
}
2527
],
26-
"name": "android_debug_x64",
28+
"name": "android_emulator_debug_x64",
2729
"ninja": {
28-
"config": "android_debug_x64",
30+
"config": "android_emulator_debug_x64",
2931
"targets": [
3032
"flutter/shell/platform/android:flutter_shell_native_unittests",
3133
"flutter/testing/scenario_app"
@@ -51,7 +53,7 @@
5153
"script": "flutter/testing/run_tests.py",
5254
"parameters": [
5355
"--android-variant",
54-
"android_debug_x64",
56+
"android_emulator_debug_x64",
5557
"--type",
5658
"android"
5759
]
@@ -74,7 +76,7 @@
7476
],
7577
"script": "flutter/testing/scenario_app/run_android_tests.sh",
7678
"parameters": [
77-
"android_debug_x64",
79+
"android_emulator_debug_x64",
7880
"--no-enable-impeller"
7981
]
8082
},
@@ -96,7 +98,7 @@
9698
],
9799
"script": "flutter/testing/scenario_app/run_android_tests.sh",
98100
"parameters": [
99-
"android_debug_x64",
101+
"android_emulator_debug_x64",
100102
"--enable-impeller",
101103
"--impeller-backend=vulkan"
102104
]
@@ -119,7 +121,7 @@
119121
],
120122
"script": "flutter/testing/scenario_app/run_android_tests.sh",
121123
"parameters": [
122-
"android_debug_x64",
124+
"android_emulator_debug_x64",
123125
"--enable-impeller",
124126
"--impeller-backend=opengles"
125127
]
@@ -141,17 +143,19 @@
141143
"--android-cpu=x86",
142144
"--no-lto",
143145
"--rbe",
144-
"--no-goma"
146+
"--no-goma",
147+
"--target-dir",
148+
"android_emulator_debug_x86"
145149
],
146150
"dependencies": [
147151
{
148152
"dependency": "goldctl",
149153
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
150154
}
151155
],
152-
"name": "android_debug_x86",
156+
"name": "android_emulator_debug_x86",
153157
"ninja": {
154-
"config": "android_debug_x86",
158+
"config": "android_emulator_debug_x86",
155159
"targets": [
156160
"flutter/shell/platform/android:flutter_shell_native_unittests",
157161
"flutter/testing/scenario_app"
@@ -177,7 +181,7 @@
177181
"script": "flutter/testing/run_tests.py",
178182
"parameters": [
179183
"--android-variant",
180-
"android_debug_x86",
184+
"android_emulator_debug_x86",
181185
"--type",
182186
"android"
183187
]

‎ci/builders/linux_android_emulator_api_33.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
"--android-cpu=x64",
1616
"--no-lto",
1717
"--rbe",
18-
"--no-goma"
18+
"--no-goma",
19+
"--target-dir",
20+
"android_debug_api33_x64"
1921
],
2022
"dependencies": [
2123
{
2224
"dependency": "goldctl",
2325
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
2426
}
2527
],
26-
"name": "android_debug_x64",
28+
"name": "android_debug_api33_x64",
2729
"ninja": {
28-
"config": "android_debug_x64",
30+
"config": "android_debug_api33_x64",
2931
"targets": [
3032
"flutter/shell/platform/android:flutter_shell_native_unittests",
3133
"flutter/testing/scenario_app"
@@ -51,7 +53,7 @@
5153
"script": "flutter/testing/run_tests.py",
5254
"parameters": [
5355
"--android-variant",
54-
"android_debug_x64",
56+
"android_debug_api33_x64",
5557
"--type",
5658
"android"
5759
]
@@ -74,7 +76,7 @@
7476
],
7577
"script": "flutter/testing/scenario_app/run_android_tests.sh",
7678
"parameters": [
77-
"android_debug_x64"
79+
"android_debug_api33_x64"
7880
]
7981
}
8082
]

‎ci/builders/linux_clang_tidy.json‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"--android",
1111
"--android-cpu",
1212
"arm64",
13-
"--no-lto"
13+
"--no-lto",
14+
"--target-dir",
15+
"android_debug_arm64_clang_tidy"
1416
],
15-
"name": "android_debug_arm64",
17+
"name": "android_debug_arm64_clang_tidy",
1618
"ninja": {
17-
"config": "android_debug_arm64"
19+
"config": "android_debug_arm64_clang_tidy"
1820
}
1921
},
2022
{
@@ -27,11 +29,13 @@
2729
"--runtime-mode",
2830
"debug",
2931
"--prebuilt-dart-sdk",
30-
"--no-lto"
32+
"--no-lto",
33+
"--target-dir",
34+
"host_debug_clang_tidy"
3135
],
32-
"name": "host_debug",
36+
"name": "host_debug_clang_tidy",
3337
"ninja": {
34-
"config": "host_debug"
38+
"config": "host_debug_clang_tidy"
3539
}
3640
}
3741
],
@@ -48,19 +52,19 @@
4852
"download_android_deps": false
4953
},
5054
"dependencies": [
51-
"host_debug"
55+
"host_debug_clang_tidy"
5256
],
5357
"tasks": [
5458
{
5559
"name": "test: lint host_debug",
5660
"parameters": [
5761
"--variant",
58-
"host_debug",
62+
"host_debug_clang_tidy",
5963
"--lint-all",
6064
"--shard-id=0",
61-
"--shard-variants=host_debug,host_debug,host_debug"
65+
"--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
6266
],
63-
"max_attempts": 1,
67+
"max_attempts": 1,
6468
"script": "flutter/ci/clang_tidy.sh"
6569
}
6670
]
@@ -77,19 +81,19 @@
7781
"download_android_deps": false
7882
},
7983
"dependencies": [
80-
"host_debug"
84+
"host_debug_clang_tidy"
8185
],
8286
"tasks": [
8387
{
8488
"name": "test: lint host_debug",
8589
"parameters": [
8690
"--variant",
87-
"host_debug",
91+
"host_debug_clang_tidy",
8892
"--lint-all",
8993
"--shard-id=1",
90-
"--shard-variants=host_debug,host_debug,host_debug"
94+
"--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
9195
],
92-
"max_attempts": 1,
96+
"max_attempts": 1,
9397
"script": "flutter/ci/clang_tidy.sh"
9498
}
9599
]
@@ -106,20 +110,19 @@
106110
"download_android_deps": false
107111
},
108112
"dependencies": [
109-
"host_debug",
110-
"android_debug_arm64"
113+
"host_debug_clang_tidy"
111114
],
112115
"tasks": [
113116
{
114117
"name": "test: lint host_debug",
115118
"parameters": [
116119
"--variant",
117-
"host_debug",
120+
"host_debug_clang_tidy",
118121
"--lint-all",
119122
"--shard-id=2",
120-
"--shard-variants=host_debug,host_debug,host_debug"
123+
"--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
121124
],
122-
"max_attempts": 1,
125+
"max_attempts": 1,
123126
"script": "flutter/ci/clang_tidy.sh"
124127
}
125128
]
@@ -136,20 +139,19 @@
136139
"download_android_deps": false
137140
},
138141
"dependencies": [
139-
"host_debug",
140-
"android_debug_arm64"
142+
"host_debug_clang_tidy"
141143
],
142144
"tasks": [
143145
{
144146
"name": "test: lint host_debug",
145147
"parameters": [
146148
"--variant",
147-
"host_debug",
149+
"host_debug_clang_tidy",
148150
"--lint-all",
149151
"--shard-id=3",
150-
"--shard-variants=host_debug,host_debug,host_debug"
152+
"--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
151153
],
152-
"max_attempts": 1,
154+
"max_attempts": 1,
153155
"script": "flutter/ci/clang_tidy.sh"
154156
}
155157
]
@@ -163,20 +165,20 @@
163165
"cores=32"
164166
],
165167
"dependencies": [
166-
"host_debug",
167-
"android_debug_arm64"
168+
"host_debug_clang_tidy",
169+
"android_debug_arm64_clang_tidy"
168170
],
169171
"tasks": [
170172
{
171173
"name": "test: lint android_debug_arm64",
172174
"parameters": [
173175
"--variant",
174-
"android_debug_arm64",
176+
"android_debug_arm64_clang_tidy",
175177
"--lint-all",
176178
"--shard-id=0",
177-
"--shard-variants=host_debug,host_debug,host_debug,host_debug"
179+
"--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
178180
],
179-
"max_attempts": 1,
181+
"max_attempts": 1,
180182
"script": "flutter/ci/clang_tidy.sh"
181183
}
182184
]

‎ci/builders/linux_host_desktop_engine.json‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"archives": [
55
{
66
"name": "host_debug",
7-
"base_path": "out/host_debug/zip_archives/",
7+
"base_path": "out/host_debug_desktop/zip_archives/",
88
"type": "gcs",
99
"include_paths": [
10-
"out/host_debug/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
10+
"out/host_debug_desktop/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
1111
],
1212
"realm": "production"
1313
}
@@ -26,11 +26,13 @@
2626
"--enable-fontconfig",
2727
"--prebuilt-dart-sdk",
2828
"--rbe",
29-
"--no-goma"
29+
"--no-goma",
30+
"--target-dir",
31+
"host_debug_desktop"
3032
],
31-
"name": "host_debug",
33+
"name": "host_debug_desktop",
3234
"ninja": {
33-
"config": "host_debug",
35+
"config": "host_debug_desktop",
3436
"targets": [
3537
"flutter/shell/platform/linux:flutter_gtk"
3638
]
@@ -40,10 +42,10 @@
4042
"archives": [
4143
{
4244
"name": "host_profile",
43-
"base_path": "out/host_profile/zip_archives/",
45+
"base_path": "out/host_profile_desktop/zip_archives/",
4446
"type": "gcs",
4547
"include_paths": [
46-
"out/host_profile/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
48+
"out/host_profile_desktop/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
4749
],
4850
"realm": "production"
4951
}
@@ -63,11 +65,13 @@
6365
"--enable-fontconfig",
6466
"--prebuilt-dart-sdk",
6567
"--rbe",
66-
"--no-goma"
68+
"--no-goma",
69+
"--target-dir",
70+
"host_profile_desktop"
6771
],
68-
"name": "host_profile",
72+
"name": "host_profile_desktop",
6973
"ninja": {
70-
"config": "host_profile",
74+
"config": "host_profile_desktop",
7175
"targets": [
7276
"flutter/shell/platform/linux:flutter_gtk"
7377
]
@@ -77,10 +81,10 @@
7781
"archives": [
7882
{
7983
"name": "host_release",
80-
"base_path": "out/host_release/zip_archives/",
84+
"base_path": "out/host_release_desktop/zip_archives/",
8185
"type": "gcs",
8286
"include_paths": [
83-
"out/host_release/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
87+
"out/host_release_desktop/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
8488
],
8589
"realm": "production"
8690
}
@@ -99,11 +103,13 @@
99103
"--enable-fontconfig",
100104
"--prebuilt-dart-sdk",
101105
"--rbe",
102-
"--no-goma"
106+
"--no-goma",
107+
"--target-dir",
108+
"host_release_desktop"
103109
],
104-
"name": "host_release",
110+
"name": "host_release_desktop",
105111
"ninja": {
106-
"config": "host_release",
112+
"config": "host_release_desktop",
107113
"targets": [
108114
"flutter/shell/platform/linux:flutter_gtk"
109115
]

0 commit comments

Comments
 (0)