From bd1fda14106fe4be3d4fd9983429e89929e3de2e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 21 Jul 2023 07:58:00 +0200 Subject: [PATCH] Revert "Enable Unity Build on QtBase for 3 Configurations" This reverts commit 7b7dd85ca62dc53c21ea8272ff40aa60ce6288bf. 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: I0933d912215e8303e982c8649bc448103568ea65 Reviewed-by: Volker Hilsheimer --- coin/platform_configs/cmake_platforms.yaml | 8 ++++---- coin/platform_configs/integrity.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f099b73c..7f7f7a3d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -256,11 +256,11 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', @@ -270,11 +270,11 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg -unity-build' + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}', diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index c1ac928c..d740656d 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -8,9 +8,9 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli -unity-build', + 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF -DQT_UNITY_BUILD=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',