lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-25 22:27:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace Ubuntu 20.04 with Ubuntu 22.04

Browse Source 
Libclang version is built with Ubuntu 22.04 on it, others still
keep old one which is built with Ubuntu 20.04.

Task-number: QTQAINFRA-4926
Change-Id: I47bb49c1efecab6863ae52d3acf7eb47bdc47c35
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 64b24b0d85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Heikki Halmet
2022-10-04 14:11:14 +03:00
committed by Qt Cherry-pick Bot
parent aa520141a0
commit cd22843cae
19 changed files with 58 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/platform_configs/cmake_platforms.yaml
View File

@@ -8,15 +8,15 @@ Include: [
]
Configurations:
-
Id: 'ubuntu-20.04-documentation'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'ubuntu-20.04'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Id: 'ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'

12
coin/platform_configs/cmake_platforms_qemu.yaml
View File

@@ -2,11 +2,11 @@ Version: 2
Configurations:
-
Id: 'qemu-armv7-developer-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
@@ -19,11 +19,11 @@ Configurations:
]
-
Id: 'qemu-arm64-developer-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -36,11 +36,11 @@ Configurations:
]
-
Id: 'qemu-mips64-developer-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',

12
coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
View File

@@ -2,12 +2,12 @@ Version: 2
Configurations:
-
Id: 'qnx-710-x86_64-developer-build-on-linux'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -17,12 +17,12 @@ Configurations:
]
-
Id: 'qnx-710-arm64-on-linux'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -30,12 +30,12 @@ Configurations:
]
-
Id: 'qnx-710-armv7-on-linux'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',

4
coin/platform_configs/default.yaml
View File

@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
Id: 'ubuntu-20.04-license-check'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Id: 'ubuntu-22.04-license-check'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

2
coin/platform_configs/flashing-wizard.yaml
View File

@@ -34,6 +34,6 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

6
coin/platform_configs/integrity.yaml
View File

@@ -2,13 +2,13 @@ Version: 2
Configurations:
-
Id: "integrity-arm64"
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'ubuntu-20.04'
Platform dependency: 'ubuntu-22.04'
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',

20
coin/platform_configs/meta-boot2qt.yaml
View File

@@ -2,42 +2,42 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET10'

2
coin/platform_configs/precheck.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Include: [
cmake_platforms.yaml: [
"ubuntu-20.04",
"ubuntu-22.04",
"windows-10_22h2-msvc2019-developer-build",
"ios-universal"
],

2
coin/platform_configs/pyside-setup.yaml
View File

@@ -3,7 +3,7 @@ Module only: True
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

2
coin/platform_configs/qmake2cmake.yaml
View File

@@ -14,6 +14,6 @@ Configurations:
Compiler: 'GCC'
Features: ['DisableTests']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

2
coin/platform_configs/qt-creator.yaml
View File

@@ -34,6 +34,6 @@ Configurations:
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

4
coin/platform_configs/tqtc-android-automotive.yaml
View File

@@ -2,8 +2,8 @@ Version: 2
Include: [ cmake_platforms_target_android.yaml ]
Configurations:
-
Id: 'automotive-ubuntu-20.04-documentation'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Id: 'automotive-ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'

2
coin/platform_configs/tqtc-pyside-setup.yaml
View File

@@ -3,7 +3,7 @@ Module only: True
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']