| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug__gn_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug__gn_.json
|
| index 8e77477b429c2a14fbaf2922fe854aac21297950..a03655b71fa98baacc44324bf0cd1d9e7b7cc206 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug__gn_.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_debug__gn_.json
|
| @@ -47,6 +47,60 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [],
|
| + "name": "ensure_goma"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| + "--platform",
|
| + "mac-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/mac-amd64 release",
|
| + "--json-output",
|
| + "/path/to/tmp/json",
|
| + "--service-account-json",
|
| + "/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/mac-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": "/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",
|
| - "--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",
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]/goma",
|
| + "[CACHE]/cipd/goma",
|
| "--",
|
| "all"
|
| ],
|
|
|