From 6db000ab671a045d70b30dba19ba603162a5123c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 21 May 2025 11:38:15 +0200 Subject: [PATCH] platform_configs: remove ubuntu-22.04-developer-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already have same config in u2404. Replace the usage of ubuntu-22.04-developer-build with u2404 one. Pick-to: 6.10 6.9 6.8 Task-number: QTQAINFRA-7146 Change-Id: Ie304b3abbe6da9b203c1ce7eec45d7f9254a7392 Reviewed-by: Tor Arne Vestbø --- 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, 4 insertions(+), 11 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 257d4ac4..aa8c49b4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -7,14 +7,7 @@ Include: [ macos.yaml ] Configurations: -# 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'] +# Build on Ubuntu 22.04 - 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 c070d269..670f3e54 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-22.04-developer-build", + "ubuntu-24.04-x64-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 081f5fcc..91c36cdf 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-22.04-developer-build", + "ubuntu-24.04-x64-developer-build", "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp5-static", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ca5e30bb..280049a3 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-22.04-developer-build", + "ubuntu-24.04-x64-developer-build", "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp5-static",