Commit 080eaac
[ci] Remove monodroid provisionator script (#3538)
Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=2968944&view=logs&s=1afc3bfe-122c-538b-e9ad-2a86c2efcfef&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e
As of commit 08e0ccb `$(AndroidToolchainDirectory)` is set to
`$(HOME)/Library/Android` when executing on macOS Azure Pipelines
hosts, and the JDK is installed into `$HOME/Library/Android/jdk`.
Export `$JAVA_HOME` on the macOS DevOps build so that it references
the JDK that `xaprepare` installs.
Additionally, instead of relying on `$JAVA_HOME` or ib JDK tools
existing in `$PATH` on macOS, use the value of `$(JavaSdkDirectory)`
to provide full paths to JDK tools. If `$(JavaSdkDirectory)` is not
set, we set it to `$(AndroidToolchainDirectory)/jdk` which contains
the JDK we install.
We currently use the monodroid `provisionator` script to install the
JDK and select a specific version of Xcode.
However, we should no longer need to invoke the `provisionator`
script, as we're already installing the Corretto JDK and other
dependencies as part of `xaprepare`. Furthermore, we should no
longer have a dependency on Xcode 9.2, so the default macOS compiler
toolchain works. Finally, making Xcode 9.2 the default breaks
notarization, as it is missing the required tools:
notarize.rb:85:in `extract_guid': xcrun: error: unable to find utility "altool", not a developer tool or in PATH (NotarizationFailed)
from notarize.rb:107:in `run'
from notarize.rb:113:in `<main>'
xcrun: error: unable to find utility "altool", not a developer tool or in PATH
Stop running `provisionator` and use the default Xcode.1 parent bb7af63 commit 080eaac
File tree
5 files changed
+23
-37
lines changed- build-tools
- automation
- xaprepare/xaprepare
- OperatingSystems
- Steps
5 files changed
+23
-37
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | 121 | | |
130 | 122 | | |
131 | 123 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
66 | | - | |
| 65 | + | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
187 | | - | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
188 | 202 | | |
189 | 203 | | |
190 | 204 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | 23 | | |
33 | 24 | | |
34 | 25 | | |
| |||
Lines changed: 1 addition & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
| 90 | + | |
90 | 91 | | |
91 | 92 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | 93 | | |
101 | 94 | | |
102 | 95 | | |
| |||
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | 72 | | |
77 | 73 | | |
78 | 74 | | |
| |||
89 | 85 | | |
90 | 86 | | |
91 | 87 | | |
92 | | - | |
| 88 | + | |
93 | 89 | | |
94 | 90 | | |
95 | 91 | | |
| |||
0 commit comments