From 512f8ff0a26dcc50260811d0108b32679b8c1054 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 Sep 2017 13:26:33 +0300 Subject: [PATCH] Change Packaging and iOS builds to macOS 10.12 This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 5 ++--- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index acfeba93..a94a6371 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,11 +12,10 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release +qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d486061d..727dd7e9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,5 +19,5 @@ qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker