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

Reworked validation

Browse Source
This commit is contained in:
Vladimir Safonkin
2020-03-24 18:49:57 +03:00
parent 9f55156c04
commit 9e12e181a3
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
images/win/scripts/Installers/Validate-Msys2.ps1
View File

@@ -12,6 +12,11 @@ $installedTools = @(
"make" "make"
) )
$installedMinGWTools = @(
"gcc",
"cmake"
)
Write-Host "Check installed tools in msys2/usr/bin directory" Write-Host "Check installed tools in msys2/usr/bin directory"
$installedTools | ForEach-Object { $installedTools | ForEach-Object {
$toolName = $_ $toolName = $_
@@ -24,22 +29,16 @@ $installedTools | ForEach-Object {
} }
} }
Write-Host "Check gcc in msys2/mingw64/bin directory" Write-Host "Check installed tools in msys2/mingw/bin directory"
$installedMinGWTools | ForEach-Object {
$toolName = $_
try { try {
Invoke-Expression "$msys2mingwDir\gcc --version" Invoke-Expression "$msys2mingwDir\$_ --version"
} catch { } catch {
Write-Host "gcc was not installed in MSYS2 bin directory" Write-Error "$toolName was not installed in MSYS2 mingw bin directory"
Write-Error $_ Write-Error $_
exit 1 exit 1
} }
Write-Host "Check cmake in msys2/mingw64/bin directory"
try {
Invoke-Expression "$msys2mingwDir\cmake --version"
} catch {
Write-Host "cmake was not installed in MSYS2 bin directory"
Write-Error $_
exit 1
} }
# Adding description of the software to Markdown # Adding description of the software to Markdown
@@ -61,17 +60,14 @@ $pacmanVersion = Get-ToolVersion -ToolPath "$msys2BinDir/pacman" -VersionLineNum
$bashVersion = Get-ToolVersion -ToolPath "$msys2BinDir/bash" -VersionLineNumber 0 $bashVersion = Get-ToolVersion -ToolPath "$msys2BinDir/bash" -VersionLineNumber 0
$gccVersion = Get-ToolVersion -ToolPath "$msys2mingwDir/gcc" -VersionLineNumber 0 $gccVersion = Get-ToolVersion -ToolPath "$msys2mingwDir/gcc" -VersionLineNumber 0
$tarVersion = Get-ToolVersion -ToolPath "$msys2BinDir/tar" -VersionLineNumber 0 $tarVersion = Get-ToolVersion -ToolPath "$msys2BinDir/tar" -VersionLineNumber 0
$makeVersion = Get-ToolVersion -ToolPath "$msys2BinDir/make" -VersionLineNumber 0
$cmakeVersion = Get-ToolVersion -ToolPath "$msys2mingwDir/cmake" -VersionLineNumber 0
$Description = @" $Description = @"
_Tool versions_ _Tool versions_
_Pacman:_ $pacmanVersion<br/> _pacman:_ $pacmanVersion<br/>
_Bash:_ $bashVersion<br/> _bash:_ $bashVersion<br/>
_gcc:_ $gccVersion<br/> _gcc:_ $gccVersion<br/>
_tar:_ $tarVersion<br/> _tar:_ $tarVersion<br/>
_make:_ $makeVersion<br/> MSYS2 location: C:\msys64
_cmake:_ $cmakeVersion<br/>
"@ "@
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description