diff options
| author | Johanna Äijälä <johanna.aijala@qt.io> | 2021-10-20 13:06:05 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-10-21 07:56:02 +0300 |
| commit | b749b2689a6e9173cf4a951ad2feb160478c9b30 (patch) | |
| tree | 3d116b41ec81dfd3058ced62752ba614089e72b2 | |
| parent | daf76912b8226ea39ff7d72dcb9fbcd6e3ef6b00 (diff) | |
Provisioning: update Squish on linux and macOS
Custom Squish 6.7.1 for Qt6.2, macOS package back in the original form
without separate Squish server for Qt6.2.
Pick to: 6.2
Change-Id: I1edb9625f1d2891047d24676019448e8dd0fbaeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5271d9f1cf58fe773a5109661a33458452d66dbc)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 7efdc13e..a8c38573 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,20 +41,19 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.7-20210615-1349" -qtBranch="61x" +version="6.7.1" +qtBranch="62x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - version="6.7-20210301-1401" - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="15f7f8e9944fdc36b9b6e37576d6ca96713a8ac5" + compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" + sha1="1526d4d57f8025f83aad836a43e8fa0317dbddc2" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="e32e5db1713e3050c3cdce696d7509c468afc7d3" + sha1="d412c3389d95a65341b51d2e14cba47ce3b54a86" fi mountFolder="/tmp/squish" @@ -97,6 +96,9 @@ echo "Unmounting $mountFolder" sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" sudo mv "$installFolder/rta_squish_$version" "$squishFolder" +if uname -a |grep -q Darwin; then + sudo xattr -r -c "$squishFolder" +fi if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then |