From 2657a96f0ed3868490912bd7dc667b72b28aec76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 30 Aug 2018 09:54:13 +0200 Subject: Upgrade macOS 10.12.3 to 10.12.6 Also changes the resolution of the desktop to 1280x800x32, timezone to GMT and upgrades Xcode. Task-number: QTBUG-70180 Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751 Reviewed-by: Qt CI Bot Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 8878836c..ec35a2dd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,7 +14,7 @@ qtci-linux-openSUSE-42.3-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch +qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 84a6d06f..304eb0b6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -47,4 +47,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_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2.tar.gz 9.2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 462ac422..f7aba0dc 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="8.3.2" -packageName="CommandLineToolsforXcode$version.dmg" +version="9.2" +packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" +sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf" InstallCommandLineTools $url $url $sha1 $packageName $version -- cgit v1.2.3