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

[macos] remove vagrant from macos 13 (#8283)

Browse Source
This commit is contained in:
Alexey-Ayupov
2023-09-14 15:04:30 +02:00
committed by GitHub
parent 462858ccf9
commit 32d213064f
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/macos/software-report/SoftwareReport.Generator.ps1
View File

@@ -142,11 +142,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
$utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion))
$utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion))
} }
if (-not $os.IsBigSur) { if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
$utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion))
if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion))
$utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion))
}
} }
$utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("yq", $(Get-YqVersion))
$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion))

2
images/macos/tests/BasicTools.Tests.ps1
View File

@@ -139,7 +139,7 @@ Describe "wget" {
} }
} }
Describe "vagrant" -Skip:($os.IsBigSur) { Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) {
It "vagrant" { It "vagrant" {
"vagrant --version" | Should -ReturnZeroExitCode "vagrant --version" | Should -ReturnZeroExitCode
} }

3
images/macos/toolsets/toolset-13.json
View File

@@ -70,8 +70,7 @@
"unxip" "unxip"
], ],
"cask_packages": [ "cask_packages": [
"julia", "julia"
"vagrant"
] ]
}, },
"gcc": { "gcc": {