Skip to content

Commit

Permalink
Shift Linux builders from Goma to RBE
Browse files Browse the repository at this point in the history
  • Loading branch information
@zanderso
zanderso committed Feb 14, 2024
1 parent 002454e commit fa3e66d
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 74 deletions.
44 changes: 37 additions & 7 deletions ci/builders/linux_android_aot_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"profile",
"--android",
"--android-cpu",
"arm"
"arm",
"--rbe",
"--no-goma"
],
"name": "android_profile",
"ninja": {
Expand Down Expand Up @@ -56,12 +61,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"release",
"--android",
"--android-cpu",
"arm"
"arm",
"--rbe",
"--no-goma"
],
"name": "android_release",
"ninja": {
Expand Down Expand Up @@ -94,12 +104,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"release",
"--android",
"--android-cpu",
"arm64"
"arm64",
"--rbe",
"--no-goma"
],
"name": "android_release_arm64",
"ninja": {
Expand Down Expand Up @@ -143,12 +158,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--runtime-mode",
"profile",
"--android-cpu",
"arm64"
"arm64",
"--rbe",
"--no-goma"
],
"name": "android_profile_arm64",
"ninja": {
Expand All @@ -174,7 +194,7 @@
"--variant",
"android_profile_arm64"
],
"test_if": "main"
"test_if": "main"
}
]
},
Expand All @@ -198,12 +218,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"profile",
"--android",
"--android-cpu",
"x64"
"x64",
"--rbe",
"--no-goma"
],
"name": "android_profile_x64",
"ninja": {
Expand Down Expand Up @@ -236,12 +261,17 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"release",
"--android",
"--android-cpu",
"x64"
"x64",
"--rbe",
"--no-goma"
],
"name": "android_release_x64",
"ninja": {
Expand Down
56 changes: 30 additions & 26 deletions ci/builders/linux_android_debug_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x86",
"--runtime-mode=jit_release"
"--runtime-mode=jit_release",
"--rbe",
"--no-goma"
],
"name": "android_jit_release_x86",
"ninja": {
Expand Down Expand Up @@ -69,10 +74,15 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=arm",
"--no-lto"
"--no-lto",
"--rbe",
"--no-goma"
],
"name": "android_debug",
"ninja": {
Expand Down Expand Up @@ -120,33 +130,17 @@
"device_type=none",
"os=Linux"
],
"gn": [
"--android",
"--android-cpu=arm64",
"--no-lto"
],
"name": "android_debug_arm64",
"ninja": {
"config": "android_debug_arm64",
"targets": [
"flutter",
"flutter/shell/platform/android:abi_jars"
]
}
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=arm64",
"--no-lto",
"--enable-vulkan-validation-layers"
"--rbe",
"--no-goma"
],
"name": "android_debug_arm64_validation_layers",
"name": "android_debug_arm64",
"ninja": {
"config": "android_debug_arm64",
"targets": [
Expand All @@ -173,10 +167,15 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x86",
"--no-lto"
"--no-lto",
"--rbe",
"--no-goma"
],
"name": "android_debug_x86",
"ninja": {
Expand Down Expand Up @@ -205,10 +204,15 @@
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x64",
"--no-lto"
"--no-lto",
"--rbe",
"--no-goma"
],
"name": "android_debug_x64",
"ninja": {
Expand Down
21 changes: 15 additions & 6 deletions ci/builders/linux_arm_host_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,18 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--runtime-mode",
"profile",
"--no-lto",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk"
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
],
"name": "linux_profile_arm64",
"ninja": {
Expand Down Expand Up @@ -55,14 +58,17 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--runtime-mode",
"debug",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk"
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
],
"name": "linux_debug_arm64",
"ninja": {
Expand Down Expand Up @@ -92,14 +98,17 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--runtime-mode",
"release",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk"
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
],
"name": "linux_release_arm64",
"ninja": {
Expand Down
Loading

0 comments on commit fa3e66d

Please sign in to comment.