diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-03-12 19:42:36 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-03-12 20:02:29 +0200 |
| commit | 41e351d0cc83df8d6c07acf927ed6cb418ae9732 (patch) | |
| tree | 9dab4ff837b130aac737bf6d078d32d953c74ff7 /coin/provisioning/common/windows/squishInstall.ps1 | |
| parent | b160fee9bf1622f85ded5a284ea20ad84dd2da3b (diff) | |
| parent | 6fe56028971aec91f954887e368e42f537e6caf0 (diff) | |
Merge remote-tracking branch 'origin/6.1' into pyside6.1pyside6.1
Change-Id: I7c69ec340c2c36d5c4eb30c87586fb45449968bf
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
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 |