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

Provisioning: update Squish

Browse Source 
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>
This commit is contained in:
Johanna Äijälä
2019-10-16 11:51:00 +03:00
committed by Johanna Aijala
parent dcfef7226f
commit 08ded9e2f8
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/common/unix/squishInstall.sh
View File

@@ -38,14 +38,14 @@ set -ex
# This script will install squish package for Linux and Mac. # This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA) # Squish is need by Release Test Automation (RTA)
version="6.4.3" version="6.5"
# Branch version without dot # Branch version without dot
qtBranch="512x" qtBranch="513x"
squishFolder="/opt/squish" squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" 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 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 fi
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"

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

@@ -38,10 +38,10 @@
# NOTE! Make sure 64bit versions are always installed before 32bit, # NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename # because they use same folder name before a rename
$version = "6.4.3" $version = "6.5"
# Qt branch without dot (*.*) # 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 # 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. # 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]$bit,
[string]$squishPackage [string]$squishPackage
) )
# MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
$qtBranch = "511x"
}
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe" $SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"