Skip to content

Commit dad935f

Browse files
erik-bershelAlexey-Ayupov
erik-bershel
and
Alexey-Ayupov
authored
[macOS] Add Xcode 26.1.1 without runtimes (actions#13326)
Co-authored-by: alexey-ayupov <[email protected]>
1 parent fe2c39a commit dad935f

File tree

6 files changed

+59
-72
lines changed

6 files changed

+59
-72
lines changed

‎images/macos/scripts/build/Install-Xcode.ps1‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,12 @@ $xcodeVersions | ForEach-Object {
3535
Write-Host "Configuring Xcode $($_.link) ..."
3636
Invoke-XcodeRunFirstLaunch -Version $_.link
3737
Install-XcodeAdditionalSimulatorRuntimes -Version $_.link -Arch $arch -Runtimes $_.install_runtimes
38-
if (($_.link -match '^(\d+)\.(\d+)$') -and ([int]$matches[1] -ge 26)) {
38+
if (($_.link -eq "26.0.1")) {
3939
Install-XcodeAdditionalComponents -Version $_.link
40+
Update-DyldCache -Version $_.link
4041
}
4142
}
4243

43-
# Update dyld shared cache for the latest stable Xcode version
44-
if ((-not $os.IsSonoma)) {
45-
Update-DyldCache -XcodeVersions $xcodeVersions
46-
}
47-
4844
Invoke-XcodeRunFirstLaunch -Version $defaultXcode
4945

5046
Write-Host "Configuring Xcode symlinks..."

‎images/macos/scripts/helpers/Xcode.Installer.psm1‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -320,19 +320,10 @@ function Invoke-ValidateCommand {
320320
function Update-DyldCache {
321321
param (
322322
[Parameter(Mandatory)]
323-
[array] $XcodeVersions
323+
[string] $Version
324324
)
325325

326-
# Find the latest stable Xcode version (excluding beta and RC versions)
327-
$latestStableXcode = $XcodeVersions | Where-Object {
328-
-not ($_.link.Contains("beta") -or $_.link.Contains("Release_Candidate") -or $_.link.Contains("_RC"))
329-
} | Sort-Object { [version]($_.version -split '\+')[0] } -Descending | Select-Object -First 1
330-
331-
if ($latestStableXcode) {
332-
Write-Host "Updating dyld shared cache for Xcode $($latestStableXcode.link)..."
333-
Switch-Xcode -Version $latestStableXcode.link
334-
Invoke-ValidateCommand "xcrun simctl runtime dyld_shared_cache update --all"
335-
} else {
336-
Write-Host "No stable Xcode version found for dyld cache update."
337-
}
326+
Write-Host "Updating dyld shared cache for Xcode $Version ..."
327+
Switch-Xcode -Version $Version
328+
Invoke-ValidateCommand "xcrun simctl runtime dyld_shared_cache update --all"
338329
}

‎images/macos/toolsets/toolset-13.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
"default": "15.2",
44
"x64": {
55
"versions": [
6-
{ "link": "15.2", "filename": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "default", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},
7-
{ "link": "15.1", "filename": "15.1", "version": "15.1.0+15C65", "install_runtimes": "default", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"},
8-
{ "link": "15.0.1", "filename": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "default", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"},
9-
{ "link": "14.3.1", "filename": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "default", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"},
10-
{ "link": "14.2", "filename": "14.2", "version": "14.2.0+14C18", "install_runtimes": "default", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"},
11-
{ "link": "14.1", "filename": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "default", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"}
6+
{ "link": "15.2", "filename": "Xcode_15.2", "version": "15.2.0+15C500b", "install_runtimes": "default", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},
7+
{ "link": "15.1", "filename": "Xcode_15.1", "version": "15.1.0+15C65", "install_runtimes": "default", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"},
8+
{ "link": "15.0.1", "filename": "Xcode_15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "default", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"},
9+
{ "link": "14.3.1", "filename": "Xcode_14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "default", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"},
10+
{ "link": "14.2", "filename": "Xcode_14.2", "version": "14.2.0+14C18", "install_runtimes": "default", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"},
11+
{ "link": "14.1", "filename": "Xcode_14.1", "version": "14.1.0+14B47b", "install_runtimes": "default", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"}
1212
]
1313
},
1414
"arm64":{
1515
"versions": [
16-
{ "link": "15.2", "filename": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "default", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},
17-
{ "link": "15.1", "filename": "15.1", "version": "15.1.0+15C65", "install_runtimes": "default", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"},
18-
{ "link": "15.0.1", "filename": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "default", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"},
19-
{ "link": "14.3.1", "filename": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "default", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"},
20-
{ "link": "14.2", "filename": "14.2", "version": "14.2.0+14C18", "install_runtimes": "default", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"},
21-
{ "link": "14.1", "filename": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "default", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"}
16+
{ "link": "15.2", "filename": "Xcode_15.2", "version": "15.2.0+15C500b", "install_runtimes": "default", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},
17+
{ "link": "15.1", "filename": "Xcode_15.1", "version": "15.1.0+15C65", "install_runtimes": "default", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"},
18+
{ "link": "15.0.1", "filename": "Xcode_15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "default", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"},
19+
{ "link": "14.3.1", "filename": "Xcode_14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "default", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"},
20+
{ "link": "14.2", "filename": "Xcode_14.2", "version": "14.2.0+14C18", "install_runtimes": "default", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"},
21+
{ "link": "14.1", "filename": "Xcode_14.1", "version": "14.1.0+14B47b", "install_runtimes": "default", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"}
2222
]
2323
}
2424
},

‎images/macos/toolsets/toolset-14.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"versions": [
66
{
77
"link": "16.2",
8-
"filename": "16.2",
8+
"filename": "Xcode_16.2",
99
"version": "16.2+16C5032a",
1010
"sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de",
1111
"install_runtimes": [
@@ -16,42 +16,42 @@
1616
},
1717
{
1818
"link": "16.1",
19-
"filename": "16.1",
19+
"filename": "Xcode_16.1",
2020
"version": "16.1+16B40",
2121
"sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720",
2222
"install_runtimes": "default"
2323
},
2424
{
2525
"link": "15.4",
26-
"filename": "15.4",
26+
"filename": "Xcode_15.4",
2727
"version": "15.4.0+15F31d",
2828
"sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a",
2929
"install_runtimes": "default"
3030
},
3131
{
3232
"link": "15.3",
33-
"filename": "15.3",
33+
"filename": "Xcode_15.3",
3434
"version": "15.3.0+15E204a",
3535
"sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234",
3636
"install_runtimes": "default"
3737
},
3838
{
3939
"link": "15.2",
40-
"filename": "15.2",
40+
"filename": "Xcode_15.2",
4141
"version": "15.2.0+15C500b",
4242
"sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B",
4343
"install_runtimes": "default"
4444
},
4545
{
4646
"link": "15.1",
47-
"filename": "15.1",
47+
"filename": "Xcode_15.1",
4848
"version": "15.1.0+15C65",
4949
"sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05",
5050
"install_runtimes": "default"
5151
},
5252
{
5353
"link": "15.0.1",
54-
"filename": "15.0.1",
54+
"filename": "Xcode_15.0.1",
5555
"version": "15.0.1+15A507",
5656
"sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8",
5757
"symlinks": ["15.0"],
@@ -63,7 +63,7 @@
6363
"versions": [
6464
{
6565
"link": "16.2",
66-
"filename": "16.2",
66+
"filename": "Xcode_16.2",
6767
"version": "16.2+16C5032a",
6868
"sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de",
6969
"install_runtimes": [
@@ -75,42 +75,42 @@
7575
},
7676
{
7777
"link": "16.1",
78-
"filename": "16.1",
78+
"filename": "Xcode_16.1",
7979
"version": "16.1+16B40",
8080
"sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720",
8181
"install_runtimes": "default"
8282
},
8383
{
8484
"link": "15.4",
85-
"filename": "15.4",
85+
"filename": "Xcode_15.4",
8686
"version": "15.4.0+15F31d",
8787
"sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a",
8888
"install_runtimes": "default"
8989
},
9090
{
9191
"link": "15.3",
92-
"filename": "15.3",
92+
"filename": "Xcode_15.3",
9393
"version": "15.3.0+15E204a",
9494
"sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234",
9595
"install_runtimes": "default"
9696
},
9797
{
9898
"link": "15.2",
99-
"filename": "15.2",
99+
"filename": "Xcode_15.2",
100100
"version": "15.2.0+15C500b",
101101
"sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B",
102102
"install_runtimes": "default"
103103
},
104104
{
105105
"link": "15.1",
106-
"filename": "15.1",
106+
"filename": "Xcode_15.1",
107107
"version": "15.1.0+15C65",
108108
"sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05",
109109
"install_runtimes": "default"
110110
},
111111
{
112112
"link": "15.0.1",
113-
"filename": "15.0.1",
113+
"filename": "Xcode_15.0.1",
114114
"version": "15.0.1+15A507",
115115
"sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8",
116116
"symlinks": ["15.0"],

‎images/macos/toolsets/toolset-15.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
"x64": {
55
"versions": [
66
{
7-
"link": "26.1_Release_Candidate",
8-
"filename": "26.1_Release_Candidate_Universal",
9-
"version": "26.1_Release_Candidate_Universal+17B54",
7+
"link": "26.1.1",
8+
"filename": "Xcode_26.1.1_Universal",
9+
"version": "26.1.1+17B100",
1010
"symlinks": ["26.1"],
11-
"sha256": "6504F2527444D295585515C7E41A862FFD701E3255D6634A40A714C4895E6CCD",
11+
"sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
1212
"install_runtimes": "none"
1313
},
1414
{
1515
"link": "26.0.1",
16-
"filename": "26.0.1_Universal",
16+
"filename": "Xcode_26.0.1_Universal",
1717
"version": "26.0.1+17A400",
1818
"symlinks": ["26.0"],
1919
"sha256": "9881c457068c86ac91e94cca2d7116dfd01cb7179c22b0863b63c7f3bb7e7695",
2020
"install_runtimes": "default"
2121
},
2222
{
2323
"link": "16.4",
24-
"filename": "16.4",
24+
"filename": "Xcode_16.4",
2525
"version": "16.4.0+16F6",
2626
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
2727
"install_runtimes": [
@@ -32,28 +32,28 @@
3232
},
3333
{
3434
"link": "16.3",
35-
"filename": "16.3",
35+
"filename": "Xcode_16.3",
3636
"version": "16.3+16E140",
3737
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
3838
"install_runtimes": "none"
3939
},
4040
{
4141
"link": "16.2",
42-
"filename": "16.2",
42+
"filename": "Xcode_16.2",
4343
"version": "16.2+16C5032a",
4444
"sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de",
4545
"install_runtimes": "none"
4646
},
4747
{
4848
"link": "16.1",
49-
"filename": "16.1",
49+
"filename": "Xcode_16.1",
5050
"version": "16.1+16B40",
5151
"sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720",
5252
"install_runtimes": "none"
5353
},
5454
{
5555
"link": "16",
56-
"filename": "16",
56+
"filename": "Xcode_16",
5757
"version": "16.0.0+16A242d",
5858
"sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3",
5959
"symlinks": ["16.0"],
@@ -64,24 +64,24 @@
6464
"arm64":{
6565
"versions": [
6666
{
67-
"link": "26.1_Release_Candidate",
68-
"filename": "26.1_Release_Candidate_Universal",
69-
"version": "26.1_Release_Candidate_Universal+17B54",
67+
"link": "26.1.1",
68+
"filename": "Xcode_26.1.1_Universal",
69+
"version": "26.1.1+17B100",
7070
"symlinks": ["26.1"],
71-
"sha256": "6504F2527444D295585515C7E41A862FFD701E3255D6634A40A714C4895E6CCD",
71+
"sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
7272
"install_runtimes": "none"
7373
},
7474
{
7575
"link": "26.0.1",
76-
"filename": "26.0.1_Universal",
76+
"filename": "Xcode_26.0.1_Universal",
7777
"version": "26.0.1+17A400",
7878
"symlinks": ["26.0"],
7979
"sha256": "9881c457068c86ac91e94cca2d7116dfd01cb7179c22b0863b63c7f3bb7e7695",
8080
"install_runtimes": "default"
8181
},
8282
{
8383
"link": "16.4",
84-
"filename": "16.4",
84+
"filename": "Xcode_16.4",
8585
"version": "16.4.0+16F6",
8686
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
8787
"install_runtimes": [
@@ -93,28 +93,28 @@
9393
},
9494
{
9595
"link": "16.3",
96-
"filename": "16.3",
96+
"filename": "Xcode_16.3",
9797
"version": "16.3+16E140",
9898
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
9999
"install_runtimes": "none"
100100
},
101101
{
102102
"link": "16.2",
103-
"filename": "16.2",
103+
"filename": "Xcode_16.2",
104104
"version": "16.2+16C5032a",
105105
"sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de",
106106
"install_runtimes": "none"
107107
},
108108
{
109109
"link": "16.1",
110-
"filename": "16.1",
110+
"filename": "Xcode_16.1",
111111
"version": "16.1+16B40",
112112
"sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720",
113113
"install_runtimes": "none"
114114
},
115115
{
116116
"link": "16",
117-
"filename": "16",
117+
"filename": "Xcode_16",
118118
"version": "16.0.0+16A242d",
119119
"sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3",
120120
"symlinks": ["16.0"],

‎images/macos/toolsets/toolset-26.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
"arm64":{
55
"versions": [
66
{
7-
"link": "26.1_Release_Candidate",
8-
"filename": "26.1_Release_Candidate_Universal",
9-
"version": "26.1_Release_Candidate_Universal+17B54",
7+
"link": "26.1.1",
8+
"filename": "Xcode_26.1.1_Universal",
9+
"version": "26.1.1+17B100",
1010
"symlinks": ["26.1"],
11-
"sha256": "6504F2527444D295585515C7E41A862FFD701E3255D6634A40A714C4895E6CCD",
12-
"install_runtimes": "default"
11+
"sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
12+
"install_runtimes": "none"
1313
},
1414
{
1515
"link": "26.0.1",
16-
"filename": "26.0.1_Universal",
16+
"filename": "Xcode_26.0.1_Universal",
1717
"version": "26.0.1+17A400",
1818
"symlinks": ["26.0"],
1919
"sha256": "9881c457068c86ac91e94cca2d7116dfd01cb7179c22b0863b63c7f3bb7e7695",
2020
"install_runtimes": "default"
2121
},
2222
{
2323
"link": "16.4",
24-
"filename": "16.4",
24+
"filename": "Xcode_16.4",
2525
"version": "16.4.0+16F6",
2626
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
2727
"install_runtimes": [

0 commit comments

Comments
 (0)