lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-08 12:07:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows, MSYS2: Confirm correct packages are installed

Browse Source 
There have been times where we have updated the list of packages to
install, but prebuilt binaries have missed them. This change adds a
check to confirm that the expected packages are installed.

Pick-to: 6.11
Change-Id: I5f6e2b7917c45f7a220d41946e5e4030f63ca21d
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
This commit is contained in:
Nils Petter Skålerud
2026-04-24 10:59:07 +02:00
parent 73fa80bab8
commit 92af4495d1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coin/provisioning/common/windows/install-msys2.ps1
View File

@@ -20,6 +20,7 @@ $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
$TargetLocation = "C:\Utils"
$required_packages = @("perl", "make", "yasm", "diffutils")
if ((Test-Path $url_cache_prebuilt)) {
$PackagePath = "C:\Windows\Temp\$package_prebuilt"
@@ -35,7 +36,8 @@ if ((Test-Path $url_cache_prebuilt)) {
# install perl make and yasm
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm diffutils`""
$required_packages_string = $required_packages -join ' '
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm $required_packages_string`""
Start-Sleep -s 60
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
@@ -46,6 +48,16 @@ if ((Test-Path $url_cache_prebuilt)) {
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
$msys = "C:\Utils\msys64\usr\bin\bash"
# Confirm that we have the correct packages installed, in case prebuilt MSYS
# binaries are missing them.
$installed = & "$msys" -lc "pacman -Qq"
$installedSet = $installed | Sort-Object -Unique
$missing_packages = $required_packages | Where-Object { $_ -notin $installedSet }
if ($missing_packages.Count -ne 0) {
throw "Missing MSYS packages: $($missing_packages -join ' ')"
}
Write-Host "Cleaning $PackagePath.."
Remove "$PackagePath"