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

Commit 49cbb7e

Browse files
zandersozanderso
committed
Shift Linux builders from Goma to RBE
1 parent 002454e commit 49cbb7e

8 files changed

+187
-70
lines changed

‎ci/builders/linux_android_aot_engine.json‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@
1919
"device_type=none",
2020
"os=Linux"
2121
],
22+
"gclient_variables": {
23+
"use_rbe": true
24+
},
2225
"gn": [
2326
"--runtime-mode",
2427
"profile",
2528
"--android",
2629
"--android-cpu",
27-
"arm"
30+
"arm",
31+
"--rbe",
32+
"--no-goma"
2833
],
2934
"name": "android_profile",
3035
"ninja": {
@@ -56,12 +61,17 @@
5661
"device_type=none",
5762
"os=Linux"
5863
],
64+
"gclient_variables": {
65+
"use_rbe": true
66+
},
5967
"gn": [
6068
"--runtime-mode",
6169
"release",
6270
"--android",
6371
"--android-cpu",
64-
"arm"
72+
"arm",
73+
"--rbe",
74+
"--no-goma"
6575
],
6676
"name": "android_release",
6777
"ninja": {
@@ -94,12 +104,17 @@
94104
"device_type=none",
95105
"os=Linux"
96106
],
107+
"gclient_variables": {
108+
"use_rbe": true
109+
},
97110
"gn": [
98111
"--runtime-mode",
99112
"release",
100113
"--android",
101114
"--android-cpu",
102-
"arm64"
115+
"arm64",
116+
"--rbe",
117+
"--no-goma"
103118
],
104119
"name": "android_release_arm64",
105120
"ninja": {
@@ -143,12 +158,17 @@
143158
"device_type=none",
144159
"os=Linux"
145160
],
161+
"gclient_variables": {
162+
"use_rbe": true
163+
},
146164
"gn": [
147165
"--android",
148166
"--runtime-mode",
149167
"profile",
150168
"--android-cpu",
151-
"arm64"
169+
"arm64",
170+
"--rbe",
171+
"--no-goma"
152172
],
153173
"name": "android_profile_arm64",
154174
"ninja": {
@@ -174,7 +194,7 @@
174194
"--variant",
175195
"android_profile_arm64"
176196
],
177-
"test_if": "main"
197+
"test_if": "main"
178198
}
179199
]
180200
},
@@ -198,12 +218,17 @@
198218
"device_type=none",
199219
"os=Linux"
200220
],
221+
"gclient_variables": {
222+
"use_rbe": true
223+
},
201224
"gn": [
202225
"--runtime-mode",
203226
"profile",
204227
"--android",
205228
"--android-cpu",
206-
"x64"
229+
"x64",
230+
"--rbe",
231+
"--no-goma"
207232
],
208233
"name": "android_profile_x64",
209234
"ninja": {
@@ -236,12 +261,17 @@
236261
"device_type=none",
237262
"os=Linux"
238263
],
264+
"gclient_variables": {
265+
"use_rbe": true
266+
},
239267
"gn": [
240268
"--runtime-mode",
241269
"release",
242270
"--android",
243271
"--android-cpu",
244-
"x64"
272+
"x64",
273+
"--rbe",
274+
"--no-goma"
245275
],
246276
"name": "android_release_x64",
247277
"ninja": {

‎ci/builders/linux_android_debug_engine.json‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@
1717
"device_type=none",
1818
"os=Linux"
1919
],
20+
"gclient_variables": {
21+
"use_rbe": true
22+
},
2023
"gn": [
2124
"--android",
2225
"--android-cpu=x86",
23-
"--runtime-mode=jit_release"
26+
"--runtime-mode=jit_release",
27+
"--rbe",
28+
"--no-goma"
2429
],
2530
"name": "android_jit_release_x86",
2631
"ninja": {
@@ -69,10 +74,15 @@
6974
"device_type=none",
7075
"os=Linux"
7176
],
77+
"gclient_variables": {
78+
"use_rbe": true
79+
},
7280
"gn": [
7381
"--android",
7482
"--android-cpu=arm",
75-
"--no-lto"
83+
"--no-lto",
84+
"--rbe",
85+
"--no-goma"
7686
],
7787
"name": "android_debug",
7888
"ninja": {
@@ -120,33 +130,17 @@
120130
"device_type=none",
121131
"os=Linux"
122132
],
123-
"gn": [
124-
"--android",
125-
"--android-cpu=arm64",
126-
"--no-lto"
127-
],
128-
"name": "android_debug_arm64",
129-
"ninja": {
130-
"config": "android_debug_arm64",
131-
"targets": [
132-
"flutter",
133-
"flutter/shell/platform/android:abi_jars"
134-
]
135-
}
136-
},
137-
{
138-
"cas_archive": false,
139-
"drone_dimensions": [
140-
"device_type=none",
141-
"os=Linux"
142-
],
133+
"gclient_variables": {
134+
"use_rbe": true
135+
},
143136
"gn": [
144137
"--android",
145138
"--android-cpu=arm64",
146139
"--no-lto",
147-
"--enable-vulkan-validation-layers"
140+
"--rbe",
141+
"--no-goma"
148142
],
149-
"name": "android_debug_arm64_validation_layers",
143+
"name": "android_debug_arm64",
150144
"ninja": {
151145
"config": "android_debug_arm64",
152146
"targets": [
@@ -173,10 +167,15 @@
173167
"device_type=none",
174168
"os=Linux"
175169
],
170+
"gclient_variables": {
171+
"use_rbe": true
172+
},
176173
"gn": [
177174
"--android",
178175
"--android-cpu=x86",
179-
"--no-lto"
176+
"--no-lto",
177+
"--rbe",
178+
"--no-goma"
180179
],
181180
"name": "android_debug_x86",
182181
"ninja": {
@@ -205,10 +204,15 @@
205204
"device_type=none",
206205
"os=Linux"
207206
],
207+
"gclient_variables": {
208+
"use_rbe": true
209+
},
208210
"gn": [
209211
"--android",
210212
"--android-cpu=x64",
211-
"--no-lto"
213+
"--no-lto",
214+
"--rbe",
215+
"--no-goma"
212216
],
213217
"name": "android_debug_x64",
214218
"ninja": {

‎ci/builders/linux_arm_host_engine.json‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@
1717
"os=Linux"
1818
],
1919
"gclient_variables": {
20-
"download_android_deps": false
20+
"download_android_deps": false,
21+
"use_rbe": true
2122
},
2223
"gn": [
2324
"--runtime-mode",
2425
"profile",
2526
"--no-lto",
2627
"--target-os=linux",
2728
"--linux-cpu=arm64",
28-
"--prebuilt-dart-sdk"
29+
"--prebuilt-dart-sdk",
30+
"--rbe",
31+
"--no-goma"
2932
],
3033
"name": "linux_profile_arm64",
3134
"ninja": {
@@ -55,14 +58,17 @@
5558
"os=Linux"
5659
],
5760
"gclient_variables": {
58-
"download_android_deps": false
61+
"download_android_deps": false,
62+
"use_rbe": true
5963
},
6064
"gn": [
6165
"--runtime-mode",
6266
"debug",
6367
"--target-os=linux",
6468
"--linux-cpu=arm64",
65-
"--prebuilt-dart-sdk"
69+
"--prebuilt-dart-sdk",
70+
"--rbe",
71+
"--no-goma"
6672
],
6773
"name": "linux_debug_arm64",
6874
"ninja": {
@@ -92,14 +98,17 @@
9298
"os=Linux"
9399
],
94100
"gclient_variables": {
95-
"download_android_deps": false
101+
"download_android_deps": false,
102+
"use_rbe": true
96103
},
97104
"gn": [
98105
"--runtime-mode",
99106
"release",
100107
"--target-os=linux",
101108
"--linux-cpu=arm64",
102-
"--prebuilt-dart-sdk"
109+
"--prebuilt-dart-sdk",
110+
"--rbe",
111+
"--no-goma"
103112
],
104113
"name": "linux_release_arm64",
105114
"ninja": {

‎ci/builders/linux_clang_tidy.json‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
"device_type=none",
77
"os=Linux"
88
],
9+
"gclient_variables": {
10+
"use_rbe": true
11+
},
912
"gn": [
1013
"--android",
1114
"--android-cpu",
1215
"arm64",
13-
"--no-lto"
16+
"--no-lto",
17+
"--rbe",
18+
"--no-goma"
1419
],
1520
"name": "android_debug_arm64",
1621
"ninja": {
@@ -23,11 +28,17 @@
2328
"device_type=none",
2429
"os=Linux"
2530
],
31+
"gclient_variables": {
32+
"download_android_deps": false,
33+
"use_rbe": true
34+
},
2635
"gn": [
2736
"--runtime-mode",
2837
"debug",
2938
"--prebuilt-dart-sdk",
30-
"--no-lto"
39+
"--no-lto",
40+
"--rbe",
41+
"--no-goma"
3142
],
3243
"name": "host_debug",
3344
"ninja": {
@@ -60,7 +71,7 @@
6071
"--shard-id=0",
6172
"--shard-variants=host_debug,host_debug,host_debug"
6273
],
63-
"max_attempts": 1,
74+
"max_attempts": 1,
6475
"script": "flutter/ci/clang_tidy.sh"
6576
}
6677
]
@@ -89,7 +100,7 @@
89100
"--shard-id=1",
90101
"--shard-variants=host_debug,host_debug,host_debug"
91102
],
92-
"max_attempts": 1,
103+
"max_attempts": 1,
93104
"script": "flutter/ci/clang_tidy.sh"
94105
}
95106
]
@@ -119,7 +130,7 @@
119130
"--shard-id=2",
120131
"--shard-variants=host_debug,host_debug,host_debug"
121132
],
122-
"max_attempts": 1,
133+
"max_attempts": 1,
123134
"script": "flutter/ci/clang_tidy.sh"
124135
}
125136
]
@@ -149,7 +160,7 @@
149160
"--shard-id=3",
150161
"--shard-variants=host_debug,host_debug,host_debug"
151162
],
152-
"max_attempts": 1,
163+
"max_attempts": 1,
153164
"script": "flutter/ci/clang_tidy.sh"
154165
}
155166
]
@@ -176,7 +187,7 @@
176187
"--shard-id=0",
177188
"--shard-variants=host_debug,host_debug,host_debug,host_debug"
178189
],
179-
"max_attempts": 1,
190+
"max_attempts": 1,
180191
"script": "flutter/ci/clang_tidy.sh"
181192
}
182193
]

0 commit comments

Comments
 (0)