| Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| index 7987d7eb846a15349e36cb6512209682b157a54c..6cba2e3b5fd08d06ca2f3c1447261fc24484a4ff 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_x64_gn.json
|
| @@ -49,6 +49,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",
|
| @@ -59,7 +113,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 dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -72,7 +126,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"
|
| },
|
| @@ -123,7 +177,7 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[CACHE]\\cipd\\goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
|
|