diff options
| author | Johanna Aijala <johanna.aijala@qt.io> | 2018-05-24 14:49:22 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-11 13:32:27 +0000 |
| commit | 1cad3084a905454d06497bfe189b232a976b04d0 (patch) | |
| tree | 11167bdb06498d7f4b2e72a209bbbe6220a93c96 | |
| parent | 36dbfa3b97e2155636026bb0ab2776a627943318 (diff) | |
Use Squish 6.3.2 Qt5.10 on Qt5.12 RTA tests
Update to latest Squish versions that Froglogic is providing. May need
to update to Squish 6.4 later, but now we use 6.3.2.
Change-Id: I89e1f20b58cdd2e948c8021a5fdc357bfc201db1
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 6924ca4b..0f31e5fd 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.0" +version="6.3.2" # Branch version without dot -qtBranch="59x" +qtBranch="510x" 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 8db53ca7..5fb032f5 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,11 +38,11 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.0" +$version = "6.3.2" # Qt branch without dot (*.*) -$qtBranch = "59x" -# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point +$qtBranch = "510x" +# So far Squish built with Qt5.10 works also with 5.11, 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" |