scripts/slave/recipes/webrtc/ios.expected/basic.json - Issue 2133483002: Fix configuration of goma in iOS recipes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipes/webrtc/ios.expected/basic.json

Issue 2133483002: Fix configuration of goma in iOS recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: improve wording in comment 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

« no previous file with comments | « scripts/slave/recipes/ios/unified_builder_tester.expected/goma.json ('k') | scripts/slave/recipes/webrtc/ios.expected/no_tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/webrtc/ios.expected/basic.json

diff --git a/scripts/slave/recipes/webrtc/ios.expected/basic.json b/scripts/slave/recipes/webrtc/ios.expected/basic.json

index e3da603566f36c38db81ef3672b47db45d46ebc2..d25054ccb90ac04a4d4fd1378c81176c2ff91103 100644

--- a/scripts/slave/recipes/webrtc/ios.expected/basic.json

+++ b/scripts/slave/recipes/webrtc/ios.expected/basic.json

@@ -117,6 +117,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",

@@ -185,7 +239,7 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[BUILD]/goma",

+ "[CACHE]/cipd/goma",

"--",

"All"