From d36c17487c606bf0bcbfbaf139a5db7f5e56f261 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 --- 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 697dea06..0f2ba2cd 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -19,7 +19,7 @@ Configurations: Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', @@ -310,6 +310,6 @@ Configurations: Id: 'documentation-warnings' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem'] + Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2'] Platform dependency: 'ubuntu-22.04' diff --git a/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml b/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml index fc98b559..ce38c794 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', 'TestDocs', 'UseConfigure', 'StandaloneExamples'] + Features: ['Sccache', 'TestDocs', 'UseConfigure', 'StandaloneExamples', 'DocsGenerationV2'] Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-22.04-xwayland-host'