aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/macos
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-06-17 18:52:52 +0300
committerLiang Qi <liang.qi@qt.io>2018-06-01 11:45:06 +0000
commitde191df84fbdf0f7ddaa2e5d5cb10d4a475a639f (patch)
treee2389cafc3a6b3ca9eb5b4831296dccbc1f0c178 /coin/provisioning/common/macos
parent4dcb07d2d4c933767ef4965471f2ba0e83a58214 (diff)
Add macOS 10.13 to the CI
Includes provisioning scripts and modifications to default.txt enabling the build. Builds are disabled while fixing or blacklisting autotests. Task-number: QTQAINFRA-1299 Task-number: QTQAINFRA-1300 Change-Id: I0fde33c8028c7ded9d07e8d9cb0dcfb03d5db188 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/macos')
-rwxr-xr-xcoin/provisioning/common/macos/install_xcode.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh
index e569bee5..44f0a648 100755
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -49,7 +49,11 @@ function InstallXCode() {
version=$2
echo "Uncompressing and installing '$sourceFile'"
- xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
+ if [[ $sourceFile =~ tar ]]; then
+ cd /Applications/ && sudo tar -zxf "$sourceFile"
+ else
+ xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
+ fi
echo "Accept license"
sudo xcodebuild -license accept