From 43cbef7e308ffa0a453b750f17651b0fd5c6a763 Mon Sep 17 00:00:00 2001 From: Erik Bershel Date: Wed, 20 Nov 2024 13:44:49 +0100 Subject: [PATCH] [macOS] Add Xcode 15.4 to macOS-15; update disk space test --- images/macos/scripts/tests/System.Tests.ps1 | 7 +++++-- images/macos/toolsets/toolset-15.json | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index 8f55de538883..a85bec6566e7 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -8,8 +8,11 @@ Describe "Disk free space" { # 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 - $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 30GB + $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 } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 71b4ef3886b2..a002b4fc8980 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -5,14 +5,16 @@ "versions": [ { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] }, "arm64":{ "versions": [ { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] } },