From dcff43ca54d9c3286e19a5daea339455f902b0eb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 May 2024 10:37:22 +0200 Subject: [PATCH] Ubuntu 24.04 arm64: build on wayland and test offscreen and wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This amends 9eae3144040cafb3173ef922f96b7d3dc5526633 . Change-Id: Id44f1b0945ad0ef1a95a61152cad6799e7506383 Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen Reviewed-by: Liang Qi (cherry picked from commit bd4c8c26ba80c78b32aac20dcca828a378073bb0) --- coin/platform_configs/cmake_platforms.yaml | 10 +++++++--- .../nightly_ubuntu_24_04_arm64_documentation.yaml | 10 +++++++--- coin/platform_configs/qtwayland.yaml | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index da3a304d..00359bd4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04' -# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later +# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -49,12 +49,16 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] -# Test on Ubuntu 24.04 ARM64 X11 +# Test on Ubuntu 24.04 ARM64 offscreen - - Id: 'ubuntu-24.04-arm64-x11-tests' + Id: 'ubuntu-24.04-arm64-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' - Id: 'opensuse-15.5-developer-build' diff --git a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml index da7a8c17..00113341 100644 --- a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml +++ b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: # cmake_platforms.yaml -# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later +# 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' @@ -9,10 +9,14 @@ Configurations: 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 X11 +# Test on Ubuntu 24.04 ARM64 offscreen - - Id: 'ubuntu-24.04-arm64-documentation-x11-tests' + 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 52d13a7d..a9296102 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -17,6 +17,13 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04' +# Test on Ubuntu 24.04 ARM64 Wayland +- + Id: 'ubuntu-24.04-arm64-wayland-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-arm64' # Test on Debian-11.6 Wayland - Id: 'debian-11.6-arm64-wayland-tests'