mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-20 06:29:50 +00:00
Windows - Install-Msys2.ps1 - remove p7zip / 7z package (#916)
Due to conflicts with two installed versions
This commit is contained in:
@@ -18,7 +18,7 @@ $msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object {
|
|||||||
$msys2File = "$env:TEMP\msys2.tar.xz"
|
$msys2File = "$env:TEMP\msys2.tar.xz"
|
||||||
|
|
||||||
# Download the latest msys2 x86_64
|
# Download the latest msys2 x86_64
|
||||||
Write-Host "Starting msys2 download"
|
Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])"
|
||||||
(New-Object System.Net.WebClient).DownloadFile($msys2Uri, $msys2File)
|
(New-Object System.Net.WebClient).DownloadFile($msys2Uri, $msys2File)
|
||||||
Write-Host "Finished download"
|
Write-Host "Finished download"
|
||||||
|
|
||||||
@@ -45,9 +45,9 @@ bash.exe -c "pacman-key --init 2>&1"
|
|||||||
Write-Host "bash pacman-key --populate msys2"
|
Write-Host "bash pacman-key --populate msys2"
|
||||||
bash.exe -c "pacman-key --populate msys2 2>&1"
|
bash.exe -c "pacman-key --populate msys2 2>&1"
|
||||||
|
|
||||||
Write-Host "pacman --noconfirm -Sy pacman"
|
Write-Host "pacman -Sy --noconfirm --needed pacman"
|
||||||
pacman --noconfirm -Sy pacman
|
pacman -Sy --noconfirm --needed pacman
|
||||||
pacman --noconfirm -Su
|
pacman -Su --noconfirm
|
||||||
|
|
||||||
# Force stop gpg-agent to continue installation
|
# Force stop gpg-agent to continue installation
|
||||||
Get-Process gpg-agent -ErrorAction SilentlyContinue | Stop-Process -Force
|
Get-Process gpg-agent -ErrorAction SilentlyContinue | Stop-Process -Force
|
||||||
@@ -59,6 +59,9 @@ pacman.exe -Syuu --noconfirm
|
|||||||
Write-Host "Install msys2 packages"
|
Write-Host "Install msys2 packages"
|
||||||
pacman.exe -S --noconfirm --needed --noprogressbar base-devel compression
|
pacman.exe -S --noconfirm --needed --noprogressbar base-devel compression
|
||||||
|
|
||||||
|
Write-Host "Remove p7zip/7z package due to conflicts"
|
||||||
|
pacman.exe -R --noconfirm --noprogressbar p7zip
|
||||||
|
|
||||||
# mingw package list
|
# mingw package list
|
||||||
$tools = "___clang ___cmake ___llvm ___toolchain ___ragel"
|
$tools = "___clang ___cmake ___llvm ___toolchain ___ragel"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user