Skip to content

[macOS] Add Xcode 16.4 to macOS-15 images #12281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

[macOS] Add Xcode 16.4 to macOS-15 images #12281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions images/macos/scripts/tests/System.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
$os = Get-OSVersion

Describe "Disk free space" {
It "Image has more than 30GB free space" {
# we should have at least 30 GB of free space on macOS images
It "Image has more than 25GB free space" {
# we should have at least 25 GB of free space on macOS images
# 10GB here: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations
# 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
# 30GB due to: https://github.com/actions/runner-images/issues/10511
# 25GB is the current minimum due to the size of Xcode 16.4 and it's dependencies
$diskInfo = Get-PSDrive "/"
$totalSpaceGB = [math]::Floor(($diskInfo.Used + $diskInfo.Free) / 1GB)
$freeSpaceGB = [math]::Floor($diskInfo.Free / 1GB)
Write-Host " [i] Disk size: ${totalSpaceGB} GB; Free space: ${freeSpaceGB} GB"
$freeSpaceGB | Should -BeGreaterOrEqual 30
$freeSpaceGB | Should -BeGreaterOrEqual 25
}
}

Expand Down
38 changes: 25 additions & 13 deletions images/macos/toolsets/toolset-15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
"x64": {
"versions": [
{
"link": "16.3",
"link": "16.4",
"version": "16.4.0+16F6",
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
"install_runtimes": [
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4", "18.5"] },
{ "watchOS": ["11.0", "11.1", "11.2", "11.4", "11.5"] },
{ "tvOS": ["18.0", "18.1", "18.2", "18.4", "18.5"] }
]
},
{
"link": "16.3",
"version": "16.3+16E140",
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
"install_runtimes": [
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4"] },
{ "watchOS": ["11.0", "11.1", "11.2", "11.4"] },
{ "tvOS": ["18.0", "18.1", "18.2", "18.4"] }
]
"install_runtimes": "none"
},
{
"link": "16.2",
Expand All @@ -37,16 +43,22 @@
"arm64":{
"versions": [
{
"link": "16.3",
"version": "16.3+16E140",
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
"link": "16.4",
"version": "16.4.0+16F6",
"sha256": "2dbf65ba28fb85b34e72c14c529a42d5c3189ab0f11fb29fdebd5f4ee6c87900",
"install_runtimes": [
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4"] },
{ "watchOS": ["11.0", "11.1", "11.2", "11.4"] },
{ "tvOS": ["18.0", "18.1", "18.2", "18.4"] },
{ "visionOS": ["2.0", "2.1", "2.2", "2.3", "2.4"] }
{ "iOS": ["18.0", "18.1", "18.2", "18.3.1", "18.4", "18.5"] },
{ "watchOS": ["11.0", "11.1", "11.2", "11.4", "11.5"] },
{ "tvOS": ["18.0", "18.1", "18.2", "18.4", "18.5"] },
{ "visionOS": ["2.0", "2.1", "2.2", "2.3", "2.4", "2.5"] }
]
},
{
"link": "16.3",
"version": "16.3+16E140",
"sha256": "c593177b73e45f31e1cf7ced131760d8aa8e1532f5bbf8ba11a4ded01da14fbb",
"install_runtimes": "none"
},
{
"link": "16.2",
"version": "16.2+16C5032a",
Expand Down