From 8101b5471497ff9a617439971e7fdea0557fd39d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 19 Dec 2019 15:28:53 +0200 Subject: Provisioning: Update Windows 10 x86_64 to version 1909 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are also updated to tier1 image: msvc 2017: Not installed msvc 2019: version 16.4.4 msvc 2019 build tools: version 16.4.4 Task-number: QTQAINFRA-3623 Task-number: QTQAINFRA-3417 Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/install-msys2.ps1 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c4a9680..b26df151 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -61,8 +61,13 @@ Extract-tar_gz $PackagePath $TargetLocation $msys = "$TargetLocation\$folder\msys2_shell.cmd" # install perl -Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# 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`"" + +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 } Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" -- cgit v1.2.3