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

Side by Side Diff: scripts/slave/recipes/flutter/flutter.expected/mac_cannot_find_xcode.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 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 "python", 4 "python",
5 "-u", 5 "-u",
6 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n for p in (o s.path.join(path, x) for x in os.listdir(path)):\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n", 6 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n for p in (o s.path.join(path, x) for x in os.listdir(path)):\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n",
7 "[CWD]" 7 "[SLAVE_BUILD]"
8 ], 8 ],
9 "cwd": "[SLAVE_BUILD]",
9 "name": "rmcontents everything", 10 "name": "rmcontents everything",
10 "~followup_annotations": [ 11 "~followup_annotations": [
11 "@@@STEP_LOG_LINE@python.inline@@@@", 12 "@@@STEP_LOG_LINE@python.inline@@@@",
12 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 13 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
13 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 14 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
14 "@@@STEP_LOG_LINE@python.inline@@@@", 15 "@@@STEP_LOG_LINE@python.inline@@@@",
15 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", 16 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
16 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(path):@@@", 17 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(path):@@@",
17 "@@@STEP_LOG_LINE@python.inline@ for p in (os.path.join(path, x) for x in os.listdir(path)):@@@", 18 "@@@STEP_LOG_LINE@python.inline@ for p in (os.path.join(path, x) for x in os.listdir(path)):@@@",
18 "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@", 19 "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@",
19 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@ ", 20 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@ ",
20 "@@@STEP_LOG_LINE@python.inline@ else:@@@", 21 "@@@STEP_LOG_LINE@python.inline@ else:@@@",
21 "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@", 22 "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@",
22 "@@@STEP_LOG_END@python.inline@@@" 23 "@@@STEP_LOG_END@python.inline@@@"
23 ] 24 ]
24 }, 25 },
25 { 26 {
26 "cmd": [ 27 "cmd": [
27 "python", 28 "python",
28 "-u", 29 "-u",
29 "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", 30 "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
30 "--path", 31 "--path",
31 "[CWD]/flutter", 32 "[SLAVE_BUILD]/flutter",
32 "--url", 33 "--url",
33 "https://chromium.googlesource.com/external/github.com/flutter/flutter" 34 "https://chromium.googlesource.com/external/github.com/flutter/flutter"
34 ], 35 ],
36 "cwd": "[SLAVE_BUILD]",
35 "name": "git setup" 37 "name": "git setup"
36 }, 38 },
37 { 39 {
38 "cmd": [ 40 "cmd": [
39 "git", 41 "git",
40 "retry", 42 "retry",
41 "fetch", 43 "fetch",
42 "origin", 44 "origin",
43 "master", 45 "master",
44 "--recurse-submodules" 46 "--recurse-submodules"
45 ], 47 ],
46 "cwd": "[CWD]/flutter", 48 "cwd": "[SLAVE_BUILD]/flutter",
47 "name": "git fetch" 49 "name": "git fetch"
48 }, 50 },
49 { 51 {
50 "cmd": [ 52 "cmd": [
51 "git", 53 "git",
52 "checkout", 54 "checkout",
53 "-f", 55 "-f",
54 "FETCH_HEAD" 56 "FETCH_HEAD"
55 ], 57 ],
56 "cwd": "[CWD]/flutter", 58 "cwd": "[SLAVE_BUILD]/flutter",
57 "name": "git checkout" 59 "name": "git checkout"
58 }, 60 },
59 { 61 {
60 "cmd": [ 62 "cmd": [
61 "git", 63 "git",
62 "rev-parse", 64 "rev-parse",
63 "HEAD" 65 "HEAD"
64 ], 66 ],
65 "cwd": "[CWD]/flutter", 67 "cwd": "[SLAVE_BUILD]/flutter",
66 "name": "read revision", 68 "name": "read revision",
67 "stdout": "/path/to/tmp/", 69 "stdout": "/path/to/tmp/",
68 "~followup_annotations": [ 70 "~followup_annotations": [
69 "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@", 71 "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
70 "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@" 72 "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
71 ] 73 ]
72 }, 74 },
73 { 75 {
74 "cmd": [ 76 "cmd": [
75 "git", 77 "git",
76 "clean", 78 "clean",
77 "-f", 79 "-f",
78 "-d", 80 "-d",
79 "-x" 81 "-x"
80 ], 82 ],
81 "cwd": "[CWD]/flutter", 83 "cwd": "[SLAVE_BUILD]/flutter",
82 "name": "git clean" 84 "name": "git clean"
83 }, 85 },
84 { 86 {
85 "cmd": [ 87 "cmd": [
86 "git", 88 "git",
87 "submodule", 89 "submodule",
88 "sync" 90 "sync"
89 ], 91 ],
90 "cwd": "[CWD]/flutter", 92 "cwd": "[SLAVE_BUILD]/flutter",
91 "name": "submodule sync" 93 "name": "submodule sync"
92 }, 94 },
93 { 95 {
94 "cmd": [ 96 "cmd": [
95 "git", 97 "git",
96 "submodule", 98 "submodule",
97 "update", 99 "update",
98 "--init", 100 "--init",
99 "--recursive" 101 "--recursive"
100 ], 102 ],
101 "cwd": "[CWD]/flutter", 103 "cwd": "[SLAVE_BUILD]/flutter",
102 "name": "submodule update" 104 "name": "submodule update"
103 }, 105 },
104 { 106 {
105 "cmd": [ 107 "cmd": [
106 "[CWD]/flutter/infra/download_android_tools.py" 108 "[SLAVE_BUILD]/flutter/infra/download_android_tools.py"
107 ], 109 ],
110 "cwd": "[SLAVE_BUILD]",
108 "name": "download android tools" 111 "name": "download android tools"
109 }, 112 },
110 { 113 {
111 "cmd": [ 114 "cmd": [
112 "python", 115 "python",
113 "-u", 116 "-u",
114 "[ROOT]/b/build/scripts/slave/ios/find_xcode.py", 117 "[BUILD]/scripts/slave/ios/find_xcode.py",
115 "--json-file", 118 "--json-file",
116 "/path/to/tmp/json" 119 "/path/to/tmp/json"
117 ], 120 ],
121 "cwd": "[SLAVE_BUILD]",
118 "env": { 122 "env": {
119 "ANDROID_HOME": "[CWD]/flutter/infra/android_tools", 123 "ANDROID_HOME": "[SLAVE_BUILD]/flutter/infra/android_tools",
120 "PATH": "[CWD]/flutter/bin:[CWD]/flutter/bin/cache/dart-sdk/bin:%(PATH)s", 124 "PATH": "[SLAVE_BUILD]/flutter/bin:[SLAVE_BUILD]/flutter/bin/cache/dart-sd k/bin:%(PATH)s",
121 "PUB_CACHE": "[CWD]/.pub-cache" 125 "PUB_CACHE": "[SLAVE_BUILD]/.pub-cache"
122 }, 126 },
123 "name": "enumerate_xcode_installations", 127 "name": "enumerate_xcode_installations",
124 "~followup_annotations": [ 128 "~followup_annotations": [
125 "@@@STEP_LOG_LINE@json.output@{@@@", 129 "@@@STEP_LOG_LINE@json.output@{@@@",
126 "@@@STEP_LOG_LINE@json.output@ \"installations\": {}@@@", 130 "@@@STEP_LOG_LINE@json.output@ \"installations\": {}@@@",
127 "@@@STEP_LOG_LINE@json.output@}@@@", 131 "@@@STEP_LOG_LINE@json.output@}@@@",
128 "@@@STEP_LOG_END@json.output@@@" 132 "@@@STEP_LOG_END@json.output@@@"
129 ] 133 ]
130 }, 134 },
131 { 135 {
132 "name": "$result", 136 "name": "$result",
133 "reason": "Xcode version 7 or above not found", 137 "reason": "Xcode version 7 or above not found",
134 "status_code": 1 138 "status_code": 1
135 } 139 }
136 ] 140 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipes/flutter/flutter.expected/mac.json ('k') | scripts/slave/recipes/gatekeeper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698