aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2018-10-17 12:34:53 +0300
committerLiang Qi <liang.qi@qt.io>2018-10-18 10:59:34 +0000
commit7e40cd3a7f108a3c17ebcf115c1b1577a664d950 (patch)
tree7f05bd94d47f4137062030d7ee66f779c1715fdb
parent4c2fea3d5d22c6b499e82cd1dd21547e92b19edc (diff)
Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0
Xcode and command line tools version 10 have been released, we should start building our Qt releases with it, both for iOS and macOS. Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new tier 1 image has been created with the updated OS and this change takes it into use. Task-number: QTQAINFRA-2274 Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat
-rw-r--r--coin/platform_configs/default.txt8
-rw-r--r--coin/platform_configs/qt3d-runtime.txt8
-rw-r--r--coin/platform_configs/qt5.txt8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh4
5 files changed, 15 insertions, 15 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index e5c9c648..8c90b80c 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -13,11 +13,11 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
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 Clang Packaging DebugAndRelease Release
+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.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests
-qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests
+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
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
index 7d0db33a..6abc5ed2 100644
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -10,10 +10,10 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 04cce5eb..37065eff 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -11,10 +11,10 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
+qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
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 edcb2345..2aa8713b 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_9.4.1.tar.gz 9.4.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.tar.gz 10.0.0
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
index ecd1bee4..83dd1bec 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
@@ -37,10 +37,10 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="9.4.1"
+version="10.0.0"
packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg"
url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName"
-sha1="efe51c11c2c99a5f1a98bbd3772dc3fa3ce78904"
+sha1="1d6abe29b8df6397c179b8e2ffbfd0293f1282b0"
InstallCommandLineTools $url $url $sha1 $packageName $version
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:32:22 +0000