From dfc9955a95178f63e3b467bb94e4f3fd4db5b33e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 28 Apr 2023 20:28:46 +0000 Subject: [PATCH] Re-enable documentation testing in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 204ea530 disabled documentation testing, as 'TestDocs' is a testing-only step, and it was combined with 'DoNotRunTests'. Move the feature under the new test-only configurations. Pick-to: 6.6 6.5 Change-Id: Ie458495904b102fa50bc18ea39167ecc89b7c03b Reviewed-by: Paul Wicking Reviewed-by: Topi Reiniö --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/qtwayland.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 2aa4077e..3c57e061 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', 'TestDocs', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] - @@ -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', 'TestOnly'] + Features: ['Sccache', 'TestDocs', 'TestOnly'] Platform dependency: 'ubuntu-22.04-documentation' - Id: 'ubuntu-22.04-x11-tests' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index 92402966..a649dc92 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -8,7 +8,7 @@ Configurations: Id: 'ubuntu-22.04-documentation-wayland-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Features: ['Sccache', 'TestDocs', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04-documentation' - Id: 'ubuntu-22.04-wayland-tests'