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

Add missing Squish installation to win10 x86 Squish archive

Browse Source 
Win10 x86 archive was missing msvc142 x86 package.

Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b43c199d4a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Johanna Äijälä
2020-09-11 08:26:47 +03:00
committed by Qt Cherry-pick Bot
parent f3b2ba1f10
commit 09071b67bf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/common/windows/squishInstall.ps1
View File

@@ -40,7 +40,7 @@ $version = "6.6.1"
$qtBranch = "515x" $qtBranch = "515x"
$targetDir = "C:\Utils\squish" $targetDir = "C:\Utils\squish"
$squishPackage = "C:\Utils\rta_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" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
# Squish license # Squish license
@@ -62,7 +62,9 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) { if (Is64BitWinHost) {
$sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800"
} else { } 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") { } elseif ($OSVersion -eq "Windows 7 Enterprise") {
$winVersion = "win7" $winVersion = "win7"
@@ -70,7 +72,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
} }
$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" $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 Verify-Checksum "C:\Utils\$squishArchive" $sha1
Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
Rename-Item "$squishPackage" "$targetDir" Rename-Item "$squishPackage" "$targetDir"