mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 04:16:39 +08:00
platform_configs: remove two u2204 tests
We already have two tests on u2404.
Replace the usage of ubuntu-22.04-developer-build-x11-tests with u2404
one.
Pick-to: 6.9 6.8
Task-number: QTQAINFRA-7146
Change-Id: Ib3b1888e1bbb70637432ac70f6116b723e71320d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit e2e25e8a66)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
28335a188b
commit
e4cc5bd5c1
@@ -25,19 +25,6 @@ Configurations:
|
|||||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
|
'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
|
# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
|
||||||
-
|
-
|
||||||
Id: 'ubuntu-24.04-arm64-developer-build'
|
Id: 'ubuntu-24.04-arm64-developer-build'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ Include: [
|
|||||||
cmake_platforms.yaml: [
|
cmake_platforms.yaml: [
|
||||||
"ubuntu-22.04",
|
"ubuntu-22.04",
|
||||||
"ubuntu-22.04-developer-build",
|
"ubuntu-22.04-developer-build",
|
||||||
"ubuntu-22.04-developer-build-x11-tests",
|
"ubuntu-24.04-x64-developer-build-x11-tests",
|
||||||
"windows-11_23H2-msvc2022-developer-build",
|
"windows-11_23H2-msvc2022-developer-build",
|
||||||
"windows-11_24H2-msvc2022-developer-build",
|
"windows-11_24H2-msvc2022-developer-build",
|
||||||
"ios-universal"
|
"ios-universal"
|
||||||
|
|||||||
Reference in New Issue
Block a user