diff options
| author | Johanna Äijälä <johanna.aijala@qt.io> | 2021-04-19 07:52:21 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-04-21 09:01:35 +0300 |
| commit | 7231d7ccf718ebc62fbdcbd204f79408e3524718 (patch) | |
| tree | 27fd7b6e3736f329f6ccf9c7446992dae0ee389e | |
| parent | 20414da7c962d27da6b11c7ab0fb1208dcd168fc (diff) | |
Provisioning: Fix Squish for Qt6 on macOS
Add correct Squish package to the 'squish_for_qt6' location.
Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 03821e82a5103560bbcf9c58de3989f6710dd899)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index d104d9d5..cc3ad9e8 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -49,9 +49,12 @@ preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build 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="562d065ed810f03cb0dad4cf81a4fc688bc813ec" + #macOS package had to redo, so it's having same filename but different location to + #keep previous provisioning in working state + preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun" + version="6.7-20210301-1401" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" sha1="80b3f36e760963a6989a49c79818bf8671d1932a" |