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

Side by Side Diff: scripts/slave/recipes/webrtc/ios.expected/trybot.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
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.expected/no_tests.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 "--version", 100 "--version",
101 "fake xcode version" 101 "fake xcode version"
102 ], 102 ],
103 "name": "find xcode", 103 "name": "find xcode",
104 "~followup_annotations": [ 104 "~followup_annotations": [
105 "@@@STEP_LOG_LINE@json.output@{}@@@", 105 "@@@STEP_LOG_LINE@json.output@{}@@@",
106 "@@@STEP_LOG_END@json.output@@@" 106 "@@@STEP_LOG_END@json.output@@@"
107 ] 107 ]
108 }, 108 },
109 { 109 {
110 "cmd": [],
111 "name": "ensure_goma"
112 },
113 {
114 "cmd": [
115 "python",
116 "-u",
117 "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
118 "--platform",
119 "mac-amd64",
120 "--dest-directory",
121 "[SLAVE_BUILD]/cipd",
122 "--json-output",
123 "/path/to/tmp/json"
124 ],
125 "name": "ensure_goma.install cipd",
126 "~followup_annotations": [
127 "@@@STEP_NEST_LEVEL@1@@@",
128 "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@ @",
129 "@@@STEP_LOG_LINE@json.output@{@@@",
130 "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\ ", @@@",
131 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-pa ckage-instance_id\"@@@",
132 "@@@STEP_LOG_LINE@json.output@}@@@",
133 "@@@STEP_LOG_END@json.output@@@"
134 ]
135 },
136 {
137 "cmd": [
138 "[SLAVE_BUILD]/cipd/cipd",
139 "ensure",
140 "--root",
141 "[CACHE]/cipd/goma",
142 "--list",
143 "infra_internal/goma/client/mac-amd64 release",
144 "--json-output",
145 "/path/to/tmp/json",
146 "--service-account-json",
147 "/creds/service_accounts/service-account-goma-client.json"
148 ],
149 "name": "ensure_goma.ensure_installed",
150 "~followup_annotations": [
151 "@@@STEP_NEST_LEVEL@1@@@",
152 "@@@STEP_LOG_LINE@json.output@{@@@",
153 "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
154 "@@@STEP_LOG_LINE@json.output@ {@@@",
155 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_i d-of-release---------\", @@@",
156 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/cli ent/mac-amd64\"@@@",
157 "@@@STEP_LOG_LINE@json.output@ }@@@",
158 "@@@STEP_LOG_LINE@json.output@ ]@@@",
159 "@@@STEP_LOG_LINE@json.output@}@@@",
160 "@@@STEP_LOG_END@json.output@@@"
161 ]
162 },
163 {
110 "cmd": [ 164 "cmd": [
111 "python", 165 "python",
112 "-u", 166 "-u",
113 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 167 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
114 "runhooks" 168 "runhooks"
115 ], 169 ],
116 "cwd": "[SLAVE_BUILD]/src", 170 "cwd": "[SLAVE_BUILD]/src",
117 "env": { 171 "env": {
118 "GYP_CROSSCOMPILE": "1", 172 "GYP_CROSSCOMPILE": "1",
119 "GYP_DEFINES": "use_goma=1 fake gyp define 1=fake value 1 fake gyp define 2=fake value 2 component=static_library OS=ios", 173 "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
168 "[GOMA_CACHE]", 222 "[GOMA_CACHE]",
169 "--build-tool", 223 "--build-tool",
170 "ninja", 224 "ninja",
171 "--compiler", 225 "--compiler",
172 "goma-clang", 226 "goma-clang",
173 "--goma-jsonstatus", 227 "--goma-jsonstatus",
174 "/path/to/tmp/json", 228 "/path/to/tmp/json",
175 "--goma-service-account-json-file", 229 "--goma-service-account-json-file",
176 "/creds/service_accounts/service-account-goma-client.json", 230 "/creds/service_accounts/service-account-goma-client.json",
177 "--goma-dir", 231 "--goma-dir",
178 "[BUILD]/goma", 232 "[CACHE]/cipd/goma",
179 "--", 233 "--",
180 "All" 234 "All"
181 ], 235 ],
182 "cwd": "[SLAVE_BUILD]/src/out/Release-iphoneos", 236 "cwd": "[SLAVE_BUILD]/src/out/Release-iphoneos",
183 "env": { 237 "env": {
184 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json" 238 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json"
185 }, 239 },
186 "name": "compile", 240 "name": "compile",
187 "~followup_annotations": [ 241 "~followup_annotations": [
188 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 242 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
189 "@@@STEP_LOG_END@json.output (invalid)@@@" 243 "@@@STEP_LOG_END@json.output (invalid)@@@"
190 ] 244 ]
191 }, 245 },
192 { 246 {
193 "name": "$result", 247 "name": "$result",
194 "recipe_result": null, 248 "recipe_result": null,
195 "status_code": 0 249 "status_code": 0
196 } 250 }
197 ] 251 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipes/webrtc/ios.expected/no_tests.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698