| Index: scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_s390___sim___beta_branch.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_s390___sim___beta_branch.json b/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_s390___sim___beta_branch.json
|
| index 8f2f4905ea020f7951ce726ec042ae2d8ed6657d..3e7ad53065696f432fd4459419c680379637be09 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_s390___sim___beta_branch.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_branches_V8_s390___sim___beta_branch.json
|
| @@ -121,7 +121,7 @@
|
| "cwd": "[SLAVE_BUILD]/v8",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "clang=1 gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_target_arch=s390",
|
| + "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_target_arch=s390",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -139,28 +139,6 @@
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/v8",
|
| - "--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",
|
| @@ -181,7 +159,7 @@
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| - "goma-clang",
|
| + "goma",
|
| "--goma-jsonstatus",
|
| "/path/to/tmp/json",
|
| "--goma-service-account-json-file",
|
|
|