lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade msys2 package and the installation script

Browse Source 
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
(cherry picked from commit 9f39df9e30)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Heikki Halmet
2020-10-29 14:13:40 +02:00
parent dd11f01de7
commit f0c314d4d4
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,46 +33,50 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# This script installs 7-Zip # This script will installs msys2
$version = "20181211" $version = "20200903"
$prog = "msys2" $prog = "msys2"
if (Is64BitWinHost) { $arch = "x86_64"
$arch = "x86_64" $sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
$sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" $sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
$folder = "msys64" $folder = "msys64"
} else {
$arch = "i686" $package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
$sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
$folder = "msys32"
}
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package"
$PackagePath = "C:\Windows\Temp\$package"
$TargetLocation = "C:\Utils" $TargetLocation = "C:\Utils"
Download $url_official $url_cache $PackagePath if ((Test-Path $url_cache_prebuilt)) {
Verify-Checksum $PackagePath $sha1 $PackagePath = "C:\Windows\Temp\$package_prebuilt"
Extract-tar_gz $PackagePath $TargetLocation Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
$msys = "$TargetLocation\$folder\msys2_shell.cmd" Verify-Checksum $PackagePath $sha1_prebuilt
Extract-7Zip $PackagePath $TargetLocation
} else {
$PackagePath = "C:\Windows\Temp\$package"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl # install perl
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. # 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 -S --noconfirm perl make`"" cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Start-Sleep -s 30 Start-Sleep -s 60
cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
Start-Sleep -s 180 Start-Sleep -s 360
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
Write-Host "Cleaning $PackagePath.." Write-Host "Cleaning $PackagePath.."
Remove-Item -Recurse -Force -Path "$PackagePath" Remove-Item -Recurse -Force -Path "$PackagePath"
Write-Output "7-Zip = $version" >> ~\versions.txt Write-Output "msys2 = $version" >> ~\versions.txt