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

Side by Side 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 unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/host_info.py", 4 "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/host_info.py",
5 "--json-file", 5 "--json-file",
6 "/path/to/tmp/json" 6 "/path/to/tmp/json"
7 ], 7 ],
8 "name": "host and tools info", 8 "name": "host and tools info",
9 "~followup_annotations": [ 9 "~followup_annotations": [
10 "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@", 10 "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 "--version", 110 "--version",
111 "fake xcode version" 111 "fake xcode version"
112 ], 112 ],
113 "name": "find xcode", 113 "name": "find xcode",
114 "~followup_annotations": [ 114 "~followup_annotations": [
115 "@@@STEP_LOG_LINE@json.output@{}@@@", 115 "@@@STEP_LOG_LINE@json.output@{}@@@",
116 "@@@STEP_LOG_END@json.output@@@" 116 "@@@STEP_LOG_END@json.output@@@"
117 ] 117 ]
118 }, 118 },
119 { 119 {
120 "cmd": [],
121 "name": "ensure_goma"
122 },
123 {
124 "cmd": [
125 "python",
126 "-u",
127 "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
128 "--platform",
129 "mac-amd64",
130 "--dest-directory",
131 "[SLAVE_BUILD]/cipd",
132 "--json-output",
133 "/path/to/tmp/json"
134 ],
135 "name": "ensure_goma.install cipd",
136 "~followup_annotations": [
137 "@@@STEP_NEST_LEVEL@1@@@",
138 "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@ @",
139 "@@@STEP_LOG_LINE@json.output@{@@@",
140 "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\ ", @@@",
141 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-pa ckage-instance_id\"@@@",
142 "@@@STEP_LOG_LINE@json.output@}@@@",
143 "@@@STEP_LOG_END@json.output@@@"
144 ]
145 },
146 {
147 "cmd": [
148 "[SLAVE_BUILD]/cipd/cipd",
149 "ensure",
150 "--root",
151 "[CACHE]/cipd/goma",
152 "--list",
153 "infra_internal/goma/client/mac-amd64 release",
154 "--json-output",
155 "/path/to/tmp/json",
156 "--service-account-json",
157 "/creds/service_accounts/service-account-goma-client.json"
158 ],
159 "name": "ensure_goma.ensure_installed",
160 "~followup_annotations": [
161 "@@@STEP_NEST_LEVEL@1@@@",
162 "@@@STEP_LOG_LINE@json.output@{@@@",
163 "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
164 "@@@STEP_LOG_LINE@json.output@ {@@@",
165 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_i d-of-release---------\", @@@",
166 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/cli ent/mac-amd64\"@@@",
167 "@@@STEP_LOG_LINE@json.output@ }@@@",
168 "@@@STEP_LOG_LINE@json.output@ ]@@@",
169 "@@@STEP_LOG_LINE@json.output@}@@@",
170 "@@@STEP_LOG_END@json.output@@@"
171 ]
172 },
173 {
120 "cmd": [ 174 "cmd": [
121 "python", 175 "python",
122 "-u", 176 "-u",
123 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 177 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
124 "runhooks" 178 "runhooks"
125 ], 179 ],
126 "cwd": "[SLAVE_BUILD]/src", 180 "cwd": "[SLAVE_BUILD]/src",
127 "env": { 181 "env": {
128 "GYP_CROSSCOMPILE": "1", 182 "GYP_CROSSCOMPILE": "1",
129 "GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios", 183 "GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios",
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 "[GOMA_CACHE]", 232 "[GOMA_CACHE]",
179 "--build-tool", 233 "--build-tool",
180 "ninja", 234 "ninja",
181 "--compiler", 235 "--compiler",
182 "goma-clang", 236 "goma-clang",
183 "--goma-jsonstatus", 237 "--goma-jsonstatus",
184 "/path/to/tmp/json", 238 "/path/to/tmp/json",
185 "--goma-service-account-json-file", 239 "--goma-service-account-json-file",
186 "/creds/service_accounts/service-account-goma-client.json", 240 "/creds/service_accounts/service-account-goma-client.json",
187 "--goma-dir", 241 "--goma-dir",
188 "[BUILD]/goma", 242 "[CACHE]/cipd/goma",
189 "--", 243 "--",
190 "All" 244 "All"
191 ], 245 ],
192 "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator", 246 "cwd": "[SLAVE_BUILD]/src/out/Debug-iphonesimulator",
193 "env": { 247 "env": {
194 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 248 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
195 }, 249 },
196 "name": "compile", 250 "name": "compile",
197 "~followup_annotations": [ 251 "~followup_annotations": [
198 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 252 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 "@@@STEP_LOG_END@fake log@@@", 320 "@@@STEP_LOG_END@fake log@@@",
267 "@@@STEP_LINK@fake URL text@fake URL@@@" 321 "@@@STEP_LINK@fake URL text@fake URL@@@"
268 ] 322 ]
269 }, 323 },
270 { 324 {
271 "name": "$result", 325 "name": "$result",
272 "recipe_result": null, 326 "recipe_result": null,
273 "status_code": 0 327 "status_code": 0
274 } 328 }
275 ] 329 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698