diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-21 07:57:28 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-07-21 11:41:29 +0200 |
| commit | 75486e8c6053c464b9da06a42e3784b0b433b1bf (patch) | |
| tree | f7c1540d7197fa58b3c3de77543d0151d24867b6 /coin/platform_configs | |
| parent | bd1fda14106fe4be3d4fd9983429e89929e3de2e (diff) | |
Revert "Enable Unity Build on Qt Base for macOS -developer-build"
This reverts commit 6f3ff63da5df242433e532a131736f8d1f964a78.
Unity builds have not been properly tested. In particular, they have
not been tested with an "infinite" batch-size (e.g. 100,000) to
reasonably ensure that any batch-size will work and any _new_ .cpp
files being added to SOURCES will break unity-build only in a way
that's fixable by changes in _that_ .cpp file.
The CI is not a lab for experiments. A unity-related failure has
brought the branch:dev CI to a screeching halt for a day on
2023-07-20, so we're disabling the use of it on the CI until it has
been properly tested in nightly builds and locally.
Task-number: QTBUG-109394
Change-Id: Ib1605c02bc088942acc7dfe90b3b0e39f46a41e3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/macos.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index bac03314..0aa6e04b 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -100,10 +100,10 @@ Configurations: Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples -unity-build' + Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - @@ -111,11 +111,11 @@ Configurations: Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework -unity-build' + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', ] # Test on all supported macOS versions (deployment targets) |