From e9f41970c416df0b15b2002a78f4f11a8c77068c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Jun 2025 10:37:48 +0200 Subject: [PATCH] Revert "platform_configs: remove ubuntu-22.04-developer-build" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit 6db000ab671a045d70b30dba19ba603162a5123c. Pick-to: 6.10 6.9 6.8 Task-number: QTBUG-137909 Change-Id: Iec2323da11354b3176c2428e441965b77fd768a1 Reviewed-by: Axel Spoerl --- coin/platform_configs/cmake_platforms.yaml | 9 ++++++++- coin/platform_configs/precheck.yaml | 2 +- coin/platform_configs/qtsaferenderer-runtime.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f2e535ad..dbe962d5 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -7,7 +7,14 @@ Include: [ macos.yaml ] Configurations: -# Build on Ubuntu 22.04 +# Build on Ubuntu 22.04 and test on both X11 and Wayland later +- + Id: 'ubuntu-22.04-developer-build' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples'] + 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'] - Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index 670f3e54..c070d269 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -3,7 +3,7 @@ Module only: True Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", - "ubuntu-24.04-x64-developer-build", + "ubuntu-22.04-developer-build", "ubuntu-24.04-x64-developer-build-x11-tests", "windows-11_23H2-msvc2022-developer-build", "windows-11_24H2-msvc2022-developer-build", diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index e999180b..e1c04eb6 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -6,7 +6,7 @@ Include: [ ], cmake_platforms.yaml: [ "ubuntu-22.04", - "ubuntu-24.04-x64-developer-build", + "ubuntu-22.04-developer-build", "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp6-static", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f175fa5a..4ea61e21 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -7,7 +7,7 @@ Include: [ ], cmake_platforms.yaml: [ "ubuntu-22.04", - "ubuntu-24.04-x64-developer-build", + "ubuntu-22.04-developer-build", "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp6-static",