mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-10 00:46:41 +08:00
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 commit e2e25e8a66.
Pick-to: 6.10 6.9 6.8
Task-number: QTBUG-137909
Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
@@ -27,6 +27,19 @@ Configurations:
|
||||
'VCPKG_HOST_TRIPLET=x64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
|
||||
]
|
||||
# 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",
|
||||
"windows-11_24H2-msvc2022-developer-build",
|
||||
"ios-universal"
|
||||
|
||||
Reference in New Issue
Block a user