Skip to content

Commit 34fa347

Browse files
[macos] introduce more flexible way of managind xcode runtimes (#8572)
1 parent 16f6815 commit 34fa347

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

images/macos/provision/core/xcode.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $xcodeVersions | ForEach-Object {
2929
Write-Host "Configuring Xcode $($_.link) ..."
3030
Invoke-XcodeRunFirstLaunch -Version $_.link
3131

32-
if ($_.link.Split(".")[0] -ge 14) {
32+
if ($_.install_runtimes -eq 'true') {
3333
# Additional simulator runtimes are included by default for Xcode < 14
3434
Install-AdditionalSimulatorRuntimes -Version $_.link
3535
}

images/macos/toolsets/toolset-12.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"default": "14.2",
44
"x64": {
55
"versions": [
6-
{ "link": "14.2", "version": "14.2.0+14C18" },
7-
{ "link": "14.1", "version": "14.1.0+14B47b" },
8-
{ "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"] },
6+
{ "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
7+
{ "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" },
8+
{ "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true" },
99
{ "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"] },
1010
{ "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"] },
1111
{ "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] },

images/macos/toolsets/toolset-13.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"default": "14.3.1",
44
"x64": {
55
"versions": [
6-
{ "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"},
7-
{ "link": "15.0", "version": "15.0.0+15A240d"},
8-
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
9-
{ "link": "14.2", "version": "14.2.0+14C18" },
10-
{ "link": "14.1", "version": "14.1.0+14B47b" }
6+
{ "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"},
7+
{ "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"},
8+
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" },
9+
{ "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
10+
{ "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }
1111
]
1212
},
1313
"arm64":{
1414
"versions": [
15-
{ "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"},
16-
{ "link": "15.0", "version": "15.0.0+15A240d"},
17-
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] },
18-
{ "link": "14.2", "version": "14.2.0+14C18" },
19-
{ "link": "14.1", "version": "14.1.0+14B47b" }
15+
{ "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"},
16+
{ "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"},
17+
{ "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" },
18+
{ "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" },
19+
{ "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }
2020
]
2121
}
2222
},

0 commit comments

Comments
 (0)