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

Msys2 clang-tools-extra have been added to windows deployment (#1311)

Browse Source 
* clang-tidy.exe has been added

* tools have been split to tools64\32
This commit is contained in:
Andy Mishechkin
2020-07-30 08:20:19 +04:00
committed by GitHub
parent 3794f04d7f
commit 4de7ae4bce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/win/scripts/Installers/Install-Msys2.ps1
View File

@@ -60,17 +60,18 @@ Write-Host "`n$dash Remove p7zip/7z package due to conflicts"
pacman.exe -R --noconfirm --noprogressbar p7zip pacman.exe -R --noconfirm --noprogressbar p7zip
# mingw package list # mingw package list
$tools = "___clang ___cmake ___llvm ___toolchain ___ragel" $tools64 = "___clang ___clang-tools-extra ___cmake ___llvm ___toolchain ___ragel"
$tools32 = "___clang ___cmake ___llvm ___toolchain ___ragel"
# install mingw64 packages # install mingw64 packages
Write-Host "`n$dash Install mingw64 packages" Write-Host "`n$dash Install mingw64 packages"
$pre = "mingw-w64-x86_64-" $pre = "mingw-w64-x86_64-"
pacman.exe -S --noconfirm --needed --noprogressbar $tools.replace('___', $pre).split(' ') pacman.exe -S --noconfirm --needed --noprogressbar $tools64.replace('___', $pre).split(' ')
# install mingw32 packages # install mingw32 packages
Write-Host "`n$dash Install mingw32 packages" Write-Host "`n$dash Install mingw32 packages"
$pre = "mingw-w64-i686-" $pre = "mingw-w64-i686-"
pacman.exe -S --noconfirm --needed --noprogressbar $tools.replace('___', $pre).split(' ') pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ')
# clean all packages to decrease image size # clean all packages to decrease image size
Write-Host "`n$dash Clean packages" Write-Host "`n$dash Clean packages"

1
images/win/scripts/Tests/MSYS2.Tests.ps1
View File

@@ -16,6 +16,7 @@ Describe "MSYS2" {
@{ ToolName = "gcc.exe" } @{ ToolName = "gcc.exe" }
@{ ToolName = "cmake.exe" } @{ ToolName = "cmake.exe" }
@{ ToolName = "g++.exe" } @{ ToolName = "g++.exe" }
@{ ToolName = "clang-tidy.exe" }
) { ) {
Join-Path $msys2mingwDir $ToolName | Should -Exist Join-Path $msys2mingwDir $ToolName | Should -Exist
} }