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

Side by Side Diff: scripts/slave/recipes/ios/unified_builder_tester.expected/goma.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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 "--version", 167 "--version",
168 "fake xcode version" 168 "fake xcode version"
169 ], 169 ],
170 "name": "find xcode", 170 "name": "find xcode",
171 "~followup_annotations": [ 171 "~followup_annotations": [
172 "@@@STEP_LOG_LINE@json.output@{}@@@", 172 "@@@STEP_LOG_LINE@json.output@{}@@@",
173 "@@@STEP_LOG_END@json.output@@@" 173 "@@@STEP_LOG_END@json.output@@@"
174 ] 174 ]
175 }, 175 },
176 { 176 {
177 "cmd": [],
178 "name": "ensure_goma"
179 },
180 {
181 "cmd": [
182 "python",
183 "-u",
184 "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
185 "--platform",
186 "mac-amd64",
187 "--dest-directory",
188 "[SLAVE_BUILD]/cipd",
189 "--json-output",
190 "/path/to/tmp/json"
191 ],
192 "name": "ensure_goma.install cipd",
193 "~followup_annotations": [
194 "@@@STEP_NEST_LEVEL@1@@@",
195 "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@ @",
196 "@@@STEP_LOG_LINE@json.output@{@@@",
197 "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\ ", @@@",
198 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-pa ckage-instance_id\"@@@",
199 "@@@STEP_LOG_LINE@json.output@}@@@",
200 "@@@STEP_LOG_END@json.output@@@"
201 ]
202 },
203 {
204 "cmd": [
205 "[SLAVE_BUILD]/cipd/cipd",
206 "ensure",
207 "--root",
208 "[CACHE]/cipd/goma",
209 "--list",
210 "infra_internal/goma/client/mac-amd64 release",
211 "--json-output",
212 "/path/to/tmp/json",
213 "--service-account-json",
214 "/creds/service_accounts/service-account-goma-client.json"
215 ],
216 "name": "ensure_goma.ensure_installed",
217 "~followup_annotations": [
218 "@@@STEP_NEST_LEVEL@1@@@",
219 "@@@STEP_LOG_LINE@json.output@{@@@",
220 "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
221 "@@@STEP_LOG_LINE@json.output@ {@@@",
222 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_i d-of-release---------\", @@@",
223 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/cli ent/mac-amd64\"@@@",
224 "@@@STEP_LOG_LINE@json.output@ }@@@",
225 "@@@STEP_LOG_LINE@json.output@ ]@@@",
226 "@@@STEP_LOG_LINE@json.output@}@@@",
227 "@@@STEP_LOG_END@json.output@@@"
228 ]
229 },
230 {
177 "cmd": [ 231 "cmd": [
178 "python", 232 "python",
179 "-u", 233 "-u",
180 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 234 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
181 "runhooks" 235 "runhooks"
182 ], 236 ],
183 "cwd": "[SLAVE_BUILD]/src", 237 "cwd": "[SLAVE_BUILD]/src",
184 "env": { 238 "env": {
185 "GYP_CROSSCOMPILE": "1", 239 "GYP_CROSSCOMPILE": "1",
186 "GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios", 240 "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
235 "[GOMA_CACHE]", 289 "[GOMA_CACHE]",
236 "--build-tool", 290 "--build-tool",
237 "ninja", 291 "ninja",
238 "--compiler", 292 "--compiler",
239 "goma-clang", 293 "goma-clang",
240 "--goma-jsonstatus", 294 "--goma-jsonstatus",
241 "/path/to/tmp/json", 295 "/path/to/tmp/json",
242 "--goma-service-account-json-file", 296 "--goma-service-account-json-file",
243 "/creds/service_accounts/service-account-goma-client.json", 297 "/creds/service_accounts/service-account-goma-client.json",
244 "--goma-dir", 298 "--goma-dir",
245 "[BUILD]/goma", 299 "[CACHE]/cipd/goma",
246 "--", 300 "--",
247 "All" 301 "All"
248 ], 302 ],
249 "cwd": "[SLAVE_BUILD]/src/out/Release-iphoneos", 303 "cwd": "[SLAVE_BUILD]/src/out/Release-iphoneos",
250 "env": { 304 "env": {
251 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 305 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
252 }, 306 },
253 "name": "compile", 307 "name": "compile",
254 "~followup_annotations": [ 308 "~followup_annotations": [
255 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 309 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
256 "@@@STEP_LOG_END@json.output (invalid)@@@" 310 "@@@STEP_LOG_END@json.output (invalid)@@@"
257 ] 311 ]
258 }, 312 },
259 { 313 {
260 "name": "$result", 314 "name": "$result",
261 "recipe_result": null, 315 "recipe_result": null,
262 "status_code": 0 316 "status_code": 0
263 } 317 }
264 ] 318 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipes/ios/try.expected/gyp_goma.json ('k') | scripts/slave/recipes/webrtc/ios.expected/basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698