diff options
| author | Johanna Äijälä <johanna.aijala@qt.io> | 2020-09-11 08:26:47 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-17 06:09:41 +0000 |
| commit | 09071b67bfa2e93e8a34024c23530e24fbf97c4f (patch) | |
| tree | 2a0f27f9179349d477b4dd4de472251090cfa90b /coin/provisioning/common/windows/squishInstall.ps1 | |
| parent | f3b2ba1f1055aec414d93346a305b460827b4afc (diff) | |
Add missing Squish installation to win10 x86 Squish archive
Win10 x86 archive was missing msvc142 x86 package.
Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b43c199d4add1a1fee19cf5076047e735b72e006)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 518de783..c615f9eb 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -40,7 +40,7 @@ $version = "6.6.1" $qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license @@ -62,7 +62,9 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a" + $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" + #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild + $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" @@ -70,7 +72,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Rename-Item "$squishPackage" "$targetDir" |