From d86303a561a0179003802b9591ae8b7690033d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Mon, 25 Jan 2021 13:04:06 +0200 Subject: Provisioning: Update Squish for Qt6 These are snapshot packages from Froglogic, not available for macOS yet, thus it will still use Qt5.15 based Squish. Only Linux and Win packages are updated now. Along with the Squish for Qt6 we need the Squish for Qt5 to be able to run Creator tests (since Creator is still Qt5 based). Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5 Pick-to: 6.0 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning/common/windows/squishInstall.ps1') diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..dbd6da16 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210112-1612" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" + $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" } else { $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild -- cgit v1.2.3