Do not use goma on official builds.
Goma is not supported for official builds but engine builds are still
trying to use goma making dart-internal builds to fail.
Bug: https://github.com/flutter/flutter/issues/126616
Change-Id: I44b236ec90de1600a82ee3dbf898433349ae37d1
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/44400
Reviewed-by: Jesse Seales <jseales@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Drew Roen <drewroen@google.com>
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
index 437a519..6e259b5 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
@@ -651,7 +651,8 @@
"cmd": [
"python3",
"[CACHE]/builder/src/flutter/tools/gn",
- "--ios"
+ "--ios",
+ "--no-goma"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -694,7 +695,7 @@
"hostname": "rdbhost"
}
},
- "name": "gn --ios"
+ "name": "gn --ios --no-goma"
},
{
"cmd": [],
@@ -1195,68 +1196,12 @@
]
},
{
- "cmd": [],
- "name": "setup goma (2)"
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
- "[CACHE]/goma/client/goma_ctl.py",
- "restart"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GLOG_log_dir": "[CLEANUP]",
- "GOMA_CACHE_DIR": "[CACHE]/goma",
- "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
- "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
- "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
- "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
- "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
- "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "setup goma (2).start goma",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
"cmd": [
"[CACHE]/builder/src/flutter/third_party/ninja/ninja",
- "-j",
- "200",
"-C",
- "[CACHE]/builder/src/out/ios_debug"
+ "[CACHE]/builder/src/out/ios_debug",
+ "-j",
+ "200"
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1264,8 +1209,6 @@
"ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
"ENGINE_PATH": "[CACHE]/builder",
"GIT_BRANCH": "",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -1301,324 +1244,6 @@
"name": "build ios_debug"
},
{
- "cmd": [],
- "name": "teardown goma (2)"
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
- "[CACHE]/goma/client/goma_ctl.py",
- "jsonstatus",
- "/path/to/tmp/json"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GLOG_log_dir": "[CLEANUP]",
- "GOMA_CACHE_DIR": "[CACHE]/goma",
- "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
- "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
- "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
- "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
- "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
- "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).goma jsonstatus",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"foo\": \"bar\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
- "[CACHE]/goma/client/goma_ctl.py",
- "stat"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GLOG_log_dir": "[CLEANUP]",
- "GOMA_CACHE_DIR": "[CACHE]/goma",
- "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
- "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
- "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
- "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
- "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
- "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).goma stats",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
- "[CACHE]/goma/client/goma_ctl.py",
- "stop"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GLOG_log_dir": "[CLEANUP]",
- "GOMA_CACHE_DIR": "[CACHE]/goma",
- "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
- "GOMA_DUMP_STATS_FILE": "[CACHE]/goma/client/goma_stats.json",
- "GOMA_LOCAL_OUTPUT_CACHE_DIR": "[CACHE]/goma/localoutputcache",
- "GOMA_MAX_SUM_OUTPUT_SIZE_IN_MB": "256",
- "GOMA_SERVER_HOST": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog",
- "GOMA_STORE_LOCAL_RUN_OUTPUT": "True",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).stop goma",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CLEANUP]/compiler_proxy.WARNING",
- "/path/to/tmp/"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).read goma_client warning log",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@compiler_proxy.WARNING@test log@@@",
- "@@@STEP_LOG_END@compiler_proxy.WARNING@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/goma/client/goma_stats.json",
- "/path/to/tmp/"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).read goma_stats.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"build_info\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"build_id\": 8945511751514863184, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"builder\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time_stamp\": \"2012-05-14 12:53:24.500000\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time_stamp_int\": 1337000006000@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
- "fuchsia-infra.artifacts.builds_beta_goma",
- "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
- ],
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GOMA_TMP_DIR": "[CLEANUP]/goma",
- "GOMA_USE_LOCAL": "False",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "teardown goma (2).upload goma stats to bigquery",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
"cmd": [
"dart",
"pub",
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index ff13048..99167f0 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -163,7 +163,11 @@
gn = build.get('gn')
if gn:
with api.context(env=env, env_prefixes=env_prefixes):
- api.build_util.run_gn(build.get('gn'), checkout)
+ if api.flutter_bcid.is_official_build():
+ # Goma is not supported for official builds.
+ gn = list(gn)
+ gn.append('--no-goma')
+ api.build_util.run_gn(gn, checkout)
ninja = build.get('ninja')
ninja_tool[ninja.get('tool', 'ninja')
](ninja.get('config'), checkout, ninja.get('targets', []))
