From 2d5dc5af3d76a27a357d757d479f4efe81f705b4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 18 Oct 2024 18:41:40 +0200 Subject: [PATCH] coin: Use new doc tools building instructions for TestDocs configs The documentation warning configurations marked with the TestDocs feature will now use the new doc tools building instructions from qtbase, instead of using the provisioned qdoc tools when checking the documentation for warnings. This means that each qtbase integration will build the doc tools from qttools/dev/HEAD and use those built tools associated with that qtbase sha1 integration to check documentation in all other repositories. The doc tools will be rebuilt whenever a new qtbase integration starts. See the qtbase commit 1f646bb978ed94c25f6224e801779c929096c0ae for more details. Task-number: QTBUG-128730 Change-Id: I5a981afa9ec2c2b3a5c519b961e566ec5d2cc925 Reviewed-by: Alexey Edelev (cherry picked from commit d36c17487c606bf0bcbfbaf139a5db7f5e56f261) --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b0571910..52bb1352 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -12,7 +12,7 @@ Configurations: Id: 'ubuntu-22.04-documentation' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'DocsGenerationV2'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'] - @@ -30,7 +30,7 @@ Configurations: Id: 'ubuntu-22.04-documentation-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestDocs', 'TestOnly'] + Features: ['Sccache', 'TestDocs', 'TestOnly', 'DocsGenerationV2'] Platform dependency: 'ubuntu-22.04-documentation' - Id: 'ubuntu-22.04-x11-tests' diff --git a/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml b/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml index d95746e8..3caebbc2 100644 --- a/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml +++ b/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml @@ -4,7 +4,7 @@ Configurations: # cmake_platforms.yaml Template: 'qtci-linux-Ubuntu-22.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DocsGenerationV2'] Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-22.04-xwayland-host'