mirror of https://github.com/qt/qt5.git
Revert "platform_configs: remove two u2204 tests"
Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commite2e25e8a66
. Pick-to: 6.8 Task-number: QTBUG-137909 Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commitda4d20137c
) Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit3d536d157d
)
This commit is contained in:
parent
3bb6e63119
commit
6e7c618502
|
@ -25,6 +25,19 @@ Configurations:
|
|||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
|
||||
]
|
||||
# Test on Ubuntu 22.04 X11
|
||||
-
|
||||
Id: 'ubuntu-22.04-developer-build-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'ubuntu-22.04-developer-build'
|
||||
-
|
||||
Id: 'ubuntu-22.04-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
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-developer-build'
|
||||
|
|
|
@ -4,7 +4,7 @@ Include: [
|
|||
cmake_platforms.yaml: [
|
||||
"ubuntu-22.04",
|
||||
"ubuntu-22.04-developer-build",
|
||||
"ubuntu-24.04-x64-developer-build-x11-tests",
|
||||
"ubuntu-22.04-developer-build-x11-tests",
|
||||
"windows-11_23H2-msvc2022-developer-build",
|
||||
"ios-universal"
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue