Unify the iOS/tvOS/watchOS builds in default.txt

Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Liang Qi
2018-08-23 13:33:10 +02:00
parent 7b029c8ca2
commit 2b2a639fb9
2 changed files with 3 additions and 6 deletions

View File

@@ -16,9 +16,9 @@ qtci-linux-RHEL-7.4-x86_64 GCC
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.11-x86_64-3 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release

View File

@@ -13,9 +13,6 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packagin
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2