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

Unified Diff: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json

Issue 2175153002: libyuv: Use goma from cipd (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/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json
index 55c5ff55ae69cd2eab41bf5d6b14b4548c3baad4..d6e820adb6bcaab57538e22b11cd9b90a5747499 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_debug__gn_.json
@@ -47,6 +47,60 @@
]
},
{
+ "cmd": [],
+ "name": "ensure_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
+ "--platform",
+ "windows-amd64",
+ "--dest-directory",
+ "[SLAVE_BUILD]\\cipd",
+ "--json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_goma.install cipd",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]\\cipd\\cipd",
+ "ensure",
+ "--root",
+ "[CACHE]\\cipd\\goma",
+ "--list",
+ "infra_internal/goma/client/windows-amd64 release",
+ "--json-output",
+ "/path/to/tmp/json",
+ "--service-account-json",
+ "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ ],
+ "name": "ensure_goma.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
"cmd": [
"python",
"-u",
@@ -57,7 +111,7 @@
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "clang=1 component=shared_library gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -70,7 +124,7 @@
"--root=[SLAVE_BUILD]\\src",
"gen",
"//out/Debug_x64",
- "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]\\goma\""
+ "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]\\cipd\\goma\""
],
"name": "gn"
},
@@ -121,7 +175,7 @@
"--goma-service-account-json-file",
"C:\\creds\\service_accounts\\service-account-goma-client.json",
"--goma-dir",
- "[BUILD]\\goma",
+ "[CACHE]\\cipd\\goma",
"--",
"all"
],

Powered by Google App Engine
This is Rietveld 408576698