lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 11:56:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ubuntu 24.04 arm64: build on wayland and test offscreen and wayland

Browse Source 
This amends 9eae314404 .

Change-Id: Id44f1b0945ad0ef1a95a61152cad6799e7506383
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit bd4c8c26ba)
This commit is contained in:
Liang Qi
2024-05-29 10:37:22 +02:00
parent af77e84b88
commit dcff43ca54
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/platform_configs/cmake_platforms.yaml
View File

@@ -38,7 +38,7 @@ Configurations:
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'TestOnly'] Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04' Platform dependency: 'ubuntu-22.04'
# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
- -
Id: 'ubuntu-24.04-arm64' Id: 'ubuntu-24.04-arm64'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
@@ -49,12 +49,16 @@ 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' 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
] ]
# Test on Ubuntu 24.04 ARM64 X11 # Test on Ubuntu 24.04 ARM64 offscreen
- -
Id: 'ubuntu-24.04-arm64-x11-tests' Id: 'ubuntu-24.04-arm64-offscreen-tests'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly', 'InsignificantTests'] Features: ['TestOnly', 'InsignificantTests']
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'QT_QPA_PLATFORM=offscreen'
]
Platform dependency: 'ubuntu-24.04-arm64' Platform dependency: 'ubuntu-24.04-arm64'
- -
Id: 'opensuse-15.5-developer-build' Id: 'opensuse-15.5-developer-build'

10
coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml
View File

@@ -1,7 +1,7 @@
Version: 2 Version: 2
Configurations: Configurations:
# cmake_platforms.yaml # cmake_platforms.yaml
# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later # Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later
- -
Id: 'ubuntu-24.04-arm64-documentation' Id: 'ubuntu-24.04-arm64-documentation'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
@@ -9,10 +9,14 @@ Configurations:
Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] Features: ['Documentation', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' 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}}'] Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
# Test on Ubuntu 24.04 ARM64 X11 # Test on Ubuntu 24.04 ARM64 offscreen
- -
Id: 'ubuntu-24.04-arm64-documentation-x11-tests' Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestDocs', 'TestOnly', 'InsignificantTests'] Features: ['TestDocs', 'TestOnly', 'InsignificantTests']
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'QT_QPA_PLATFORM=offscreen'
]
Platform dependency: 'ubuntu-24.04-arm64-documentation' Platform dependency: 'ubuntu-24.04-arm64-documentation'

7
coin/platform_configs/qtwayland.yaml
View File

@@ -17,6 +17,13 @@ Configurations:
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
Platform dependency: 'ubuntu-22.04' Platform dependency: 'ubuntu-22.04'
# Test on Ubuntu 24.04 ARM64 Wayland
-
Id: 'ubuntu-24.04-arm64-wayland-tests'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
Platform dependency: 'ubuntu-24.04-arm64'
# Test on Debian-11.6 Wayland # Test on Debian-11.6 Wayland
- -
Id: 'debian-11.6-arm64-wayland-tests' Id: 'debian-11.6-arm64-wayland-tests'