actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 13:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macos11] Remove imagemagick package (#9229)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2024-01-26 10:33:21 +01:00
committed by GitHub
parent 8d5da63ac4
commit 237618d14f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion))
if ($os.IsBigSur) { if ($os.IsBigSur) {
$utilities.AddToolVersion("helm", $(Get-HelmVersion)) $utilities.AddToolVersion("helm", $(Get-HelmVersion))
} }
if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsSonoma)) {
$utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion))
} }
$utilities.AddToolVersion("jq", $(Get-JqVersion)) $utilities.AddToolVersion("jq", $(Get-JqVersion))

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

@@ -191,7 +191,7 @@ Describe "yq" {
} }
} }
Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma) { Describe "imagemagick" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) {
It "imagemagick" { It "imagemagick" {
"magick -version" | Should -ReturnZeroExitCode "magick -version" | Should -ReturnZeroExitCode
} }

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

@@ -219,8 +219,7 @@
"libxext", "libxext",
"libxft", "libxft",
"tcl-tk", "tcl-tk",
"r", "r"
"imagemagick"
], ],
"cask_packages": [ "cask_packages": [
"julia" "julia"