summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Äijälä <johanna.aijala@qt.io>2019-10-16 11:51:00 +0300
committerJohanna Aijala <johanna.aijala@qt.io>2019-11-21 11:26:11 +0300
commit08ded9e2f87c3313354e578c3eefb6d95c2385e7 (patch)
tree5b36cdb5c0ddf3f7dc45f77dcaf1269d12b231a1
parentdcfef7226fb54288858d234764f15582c77f5b05 (diff)
Provisioning: update Squish
Update with custom build of Squish to be able to launch Qt5.14 applications in RTA tests. Change-Id: Ic420656852ae885b057de937baabf01135526764 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh8
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps110
2 files changed, 7 insertions, 11 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index f1b5e6b5..24a4d507 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,14 +38,14 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
-version="6.4.3"
+version="6.5"
# Branch version without dot
-qtBranch="512x"
+qtBranch="513x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
-squishFile="squish-$version-qt$qtBranch-linux64.run"
+squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run"
if uname -a |grep -q Darwin; then
- squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
+ squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg"
fi
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 2cc45785..f8d600d7 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,10 +38,10 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
-$version = "6.4.3"
+$version = "6.5"
# Qt branch without dot (*.*)
-$qtBranch = "512x"
+$qtBranch = "513x"
# 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.
@@ -62,11 +62,7 @@ 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"
+ $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"