summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-10-25 15:20:53 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2019-10-30 06:45:15 +0200
commitf8d9c13ec2b9d075b70d8202873d440fd2ba0021 (patch)
treef0482a8c2f05d34275142311a721f3410e10dab3
parent7313c2fa10e041a0750be628fae524414e24a84e (diff)
Add allowUntrusted parameter for command line tools and refresh Xcode
Apple has signed their packages with certificate which has been expired 24.11.2019. Packages are unusable without allowUntrusted parameter Also Xcode package for macOS10.13 needs to be refetched from Apple's download to local cache Task-number: QTQAINFRA-3317 Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891 (cherry picked from commit eb0ef419ec91ed580b13d54bf480087b7d33c2e1) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rwxr-xr-xcoin/provisioning/common/macos/install-commandlinetools.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh
index 7b0ead98..cd7838b6 100755
--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -50,7 +50,7 @@ function InstallCommandLineTools {
hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
- sudo installer -verbose -pkg ./*.pkg -target /
+ sudo installer -pkg ./*.pkg -target / -allowUntrusted
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
index 1ab68fec..510ce59b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1.tar.gz 10.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.1_updated.tar.gz 10.1