summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Aijala <johanna.aijala@qt.io>2018-11-28 15:33:40 +0200
committerMilla Pohjanheimo <milla.pohjanheimo@qt.io>2019-03-07 06:18:26 +0000
commit88b35a49212e4151b955a7604e20f67be0b62c9c (patch)
treefb616bae40a9f1c8733a6b8e0def89c0c66ab68b
parentcfea5af0edd05107e4d9b242c02a60765e10a07d (diff)
Update Squish to 6.4.3
Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh4
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps128
2 files changed, 17 insertions, 15 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index 4a7a6837..b40c1922 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,9 +38,9 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
-version="6.3.2"
+version="6.4.3"
# Branch version without dot
-qtBranch="510x"
+qtBranch="512x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 5fb032f5..21dfea39 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,18 +38,18 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
-$version = "6.3.2"
+$version = "6.4.3"
# Qt branch without dot (*.*)
-$qtBranch = "510x"
-# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
+$qtBranch = "512x"
+# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
$testSuite = "suite_test_squish"
-$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
+$testSuiteUrl = "$squishUrl\$testSuite.7z"
# Squish license
$licensePackage = ".squish-3-license"
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
[string]$bit,
[string]$squishPackage
)
-
+ # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
+ if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
+ $qtBranch = "511x"
+ }
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
@@ -125,25 +128,24 @@ DownloadSquishLicence $squishUrl
if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 msvc14
+ DownloadAndInstallSquish $version win64 "msvc14"
+ DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+ } else {
+ DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
- DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
if (Is64BitWinHost) {
- DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
- DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
- DownloadAndInstallSquish $version win32 "msvc14"
+ DownloadAndInstallSquish $version win32 "msvc141"
}