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

[Windows] Add ImageMagick tool (#6247)

Browse Source 
* Add ImageMagick tool

* Add ImageMagick tool
This commit is contained in:
Erik Bershel
2022-09-16 10:23:13 +02:00
committed by GitHub
parent 058d0730dd
commit 7f10a5a590
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -119,7 +119,8 @@ $toolsList = @(
(Get-WinAppDriver), (Get-WinAppDriver),
(Get-WixVersion), (Get-WixVersion),
(Get-ZstdVersion), (Get-ZstdVersion),
(Get-YAMLLintVersion) (Get-YAMLLintVersion),
(Get-ImageMagickVersion)
) )
if (Test-IsWin19) { if (Test-IsWin19) {
$toolsList += @( $toolsList += @(

6
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -307,3 +307,9 @@ function Get-SwigVersion {
$swigVersion = $Matches.Version $swigVersion = $Matches.Version
return "Swig $swigVersion" return "Swig $swigVersion"
} }
function Get-ImageMagickVersion {
(magick -version | Select-String -Pattern "Version") -match "(?<version>\d+\.\d+\.\d+-\d+)" | Out-Null
$magickVersion = $Matches.Version
return "ImageMagick $magickVersion"
}

6
images/win/scripts/Tests/ChocoPackages.Tests.ps1
View File

@@ -103,3 +103,9 @@ Describe "CMake" {
"cmake --version" | Should -ReturnZeroExitCode "cmake --version" | Should -ReturnZeroExitCode
} }
} }
Describe "ImageMagick" {
It "ImageMagick" {
"magick -version" | Should -ReturnZeroExitCode
}
}

3
images/win/toolsets/toolset-2019.json
View File

@@ -461,7 +461,8 @@
{ {
"name": "cmake.install", "name": "cmake.install",
"args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
} },
{ "name": "imagemagick" }
] ]
}, },
"node": { "node": {

3
images/win/toolsets/toolset-2022.json
View File

@@ -375,7 +375,8 @@
{ {
"name": "cmake.install", "name": "cmake.install",
"args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ]
} },
{ "name": "imagemagick" }
] ]
}, },
"node": { "node": {