Skip to content

Commit be725e1

Browse files
[macOS] Add Xcode 16.4 to macOS-15 images (#12281)
Co-authored-by: susmitamane <susmitamane@github.com>
1 parent e39fcca commit be725e1

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

images/macos/scripts/tests/System.Tests.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
33
$os = Get-OSVersion
44

55
Describe "Disk free space" {
6-
It "Image has more than 30GB free space" {
7-
# we should have at least 30 GB of free space on macOS images
6+
It "Image has more than 25GB free space" {
7+
# we should have at least 25 GB of free space on macOS images
88
# 10GB here: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations
99
# 14GB here: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
1010
# 30GB due to: https://github.com/actions/runner-images/issues/10511
11+
# 25GB is the current minimum due to the size of Xcode 16.4 and it's dependencies
1112
$diskInfo = Get-PSDrive "/"
1213
$totalSpaceGB = [math]::Floor(($diskInfo.Used + $diskInfo.Free) / 1GB)
1314
$freeSpaceGB = [math]::Floor($diskInfo.Free / 1GB)
1415
Write-Host " [i] Disk size: ${totalSpaceGB} GB; Free space: ${freeSpaceGB} GB"
15-
$freeSpaceGB | Should -BeGreaterOrEqual 30
16+
$freeSpaceGB | Should -BeGreaterOrEqual 25
1617
}
1718
}
1819

images/macos/toolsets/toolset-15.json

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@
44
"x64": {
55
"versions": [
66
{
7-
"link": "16.3",
7+
"link": "16.4",
8+
"version": "16.4.0+16F6",
9+
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
10+
"install_runtimes": [
11+
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4", "18.5"] },
12+
{ "watchOS": ["11.0", "11.1", "11.2", "11.4", "11.5"] },
13+
{ "tvOS": ["18.0", "18.1", "18.2", "18.4", "18.5"] }
14+
]
15+
},
16+
{
17+
"link": "16.3",
818
"version": "16.3+16E140",
919
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
10-
"install_runtimes": [
11-
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4"] },
12-
{ "watchOS": ["11.0", "11.1", "11.2", "11.4"] },
13-
{ "tvOS": ["18.0", "18.1", "18.2", "18.4"] }
14-
]
20+
"install_runtimes": "none"
1521
},
1622
{
1723
"link": "16.2",
@@ -37,16 +43,22 @@
3743
"arm64":{
3844
"versions": [
3945
{
40-
"link": "16.3",
41-
"version": "16.3+16E140",
42-
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
46+
"link": "16.4",
47+
"version": "16.4.0+16F6",
48+
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
4349
"install_runtimes": [
44-
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4"] },
45-
{ "watchOS": ["11.0", "11.1", "11.2", "11.4"] },
46-
{ "tvOS": ["18.0", "18.1", "18.2", "18.4"] },
47-
{ "visionOS": ["2.0", "2.1", "2.2", "2.3", "2.4"] }
50+
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4", "18.5"] },
51+
{ "watchOS": ["11.0", "11.1", "11.2", "11.4", "11.5"] },
52+
{ "tvOS": ["18.0", "18.1", "18.2", "18.4", "18.5"] },
53+
{ "visionOS": ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5"] }
4854
]
4955
},
56+
{
57+
"link": "16.3",
58+
"version": "16.3+16E140",
59+
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
60+
"install_runtimes": "none"
61+
},
5062
{
5163
"link": "16.2",
5264
"version": "16.2+16C5032a",

0 commit comments

Comments
 (0)