From 6011e6a29bf6d8d407bdd1a38f6522a46e403e18 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 May 2024 14:40:39 +0200 Subject: [PATCH] Ubuntu 24.04 arm64: Add documentation targets as non-blocking in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build on wayland and test offscreen and wayland Task-number: QTQAINFRA-6112 Task-number: QTQAINFRA-6308 Change-Id: I31a57794d455316fc98f1d84d3d275fa6e934b8e Reviewed-by: Topi Reiniö (cherry picked from commit b0dc1225cbc4b4040694f042163f7e144dbb4276) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 17 ++++++++++++++ ...htly_ubuntu_24_04_arm64_documentation.yaml | 22 ------------------- coin/platform_configs/qtwayland.yaml | 6 +++++ .../04-libclang.sh | 6 +++++ 4 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 87f38e4e..5f11d615 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -39,6 +39,13 @@ Configurations: Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later +- + Id: 'ubuntu-24.04-arm64-documentation' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] + 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}}'] - Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -50,6 +57,16 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 ARM64 offscreen +- + Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_PLATFORM=offscreen' + ] + Platform dependency: 'ubuntu-24.04-arm64-documentation' - Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' diff --git a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml deleted file mode 100644 index 00113341..00000000 --- a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml +++ /dev/null @@ -1,22 +0,0 @@ -Version: 2 -Configurations: -# cmake_platforms.yaml -# Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later -- - Id: 'ubuntu-24.04-arm64-documentation' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] - 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}}'] -# Test on Ubuntu 24.04 ARM64 offscreen -- - Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestDocs', 'TestOnly', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'ubuntu-24.04-arm64-documentation' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index a9296102..d20fa417 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -18,6 +18,12 @@ Configurations: Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04' # Test on Ubuntu 24.04 ARM64 Wayland +- + Id: 'ubuntu-24.04-arm64-documentation-wayland-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-arm64-documentation' - Id: 'ubuntu-24.04-arm64-wayland-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh new file mode 100755 index 00000000..fac8d4e7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Copyright (C) 2023 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang.sh"