mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 15:38:15 +08:00
platform_configs: remove ubuntu-22.04-developer-build
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ø <tor.arne.vestbo@qt.io>
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user