Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json

Issue 2133483002: Fix configuration of goma in iOS recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
index 2a6392859861453013838e3db2b96f96995f3f93..94b75eaf348f9ee9cb3b26a010a61096de40fd82 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json
@@ -194,28 +194,6 @@
]
},
{
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "clang_revision",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [
"python",
"-u",
@@ -235,14 +213,6 @@
"[GOMA_CACHE]",
"--build-tool",
"ninja",
- "--compiler",
- "goma-clang",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
- "--goma-dir",
- "[BUILD]/goma",
"--",
"All"
],
@@ -250,11 +220,7 @@
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "compile",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
+ "name": "compile"
},
{
"name": "$result",

Powered by Google App Engine
This is Rietveld 408576698