actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-15 06:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Remove VCPKG from macOS-14 (#9465)

Browse Source
This commit is contained in:
Erik Bershel
2024-03-07 21:02:41 +01:00
committed by GitHub
parent 3d9bcaefb1
commit cb3fcb62b9
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -93,7 +93,7 @@ if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) {
} }
$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion))
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSonoma)) {
$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion))
} }
$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion))

2
images/macos/scripts/tests/Common.Tests.ps1
View File

@@ -33,7 +33,7 @@ Describe "GCC" {
} }
} }
Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSonoma) {
It "vcpkg" { It "vcpkg" {
"vcpkg version" | Should -ReturnZeroExitCode "vcpkg version" | Should -ReturnZeroExitCode
} }

1
images/macos/templates/macOS-14.anka.pkr.hcl
View File

@@ -239,7 +239,6 @@ build {
"${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-gcc.sh",
"${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-cocoapods.sh",
"${path.root}/../scripts/build/install-android-sdk.sh", "${path.root}/../scripts/build/install-android-sdk.sh",
"${path.root}/../scripts/build/install-vcpkg.sh",
"${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-safari.sh",
"${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-chrome.sh",
"${path.root}/../scripts/build/install-edge.sh", "${path.root}/../scripts/build/install-edge.sh",