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 6db000ab67.

Pick-to: 6.10 6.9 6.8
Task-number: QTBUG-137909
Change-Id: Iec2323da11354b3176c2428e441965b77fd768a1
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Liang Qi
2025-06-23 10:37:48 +02:00
parent 303b4c13dc
commit e9f41970c4
4 changed files with 11 additions and 4 deletions

View File

@@ -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'

View File

@@ -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",

View File

@@ -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",

View File

@@ -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",