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

Provisioning: Add more sleep to msys2 installation

Browse Source 
Latest Windows 10 v2004 needs more sleep for msys2 installation so that
gpg-agent will be killed after the installation process is finished.
Otherwise the provisioning won't continue and it will fail to timeout.

Task-number: QTQAINFRA-3691
Change-Id: I8b214415e777845e9ff711c1de9b09553b715d92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2020-07-02 12:57:06 +03:00
parent e8dcff8a25
commit 48dd29987f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,12 +63,12 @@ $msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl
# 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`""
Start-Sleep -s 30
cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
Start-Sleep -s 60
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.
# 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 "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }