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

Remove RHEL-8.10

Browse Source 
Existing platform configs with RHEL 8 use RHEL 9 instead.

Task-number: QTQAINFRA-7529
Task-number: QTQAINFRA-7208
Change-Id: I202fdf464f59db52f7f1edbf99451054c6889e69
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 7c7bbfff4d)
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Elias Toivola
2025-11-03 17:08:07 +02:00
committed by Jani Heikkinen
parent 82ba6e4754
commit 45dd047f29
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/platform_configs/cmake_platforms.yaml
View File

@@ -254,18 +254,6 @@ Configurations:
'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'VCPKG_TARGET_TRIPLET=x64-windows-qt',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
-
Id: 'rhel-8.10'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
'VCPKG_HOST_TRIPLET=x64-linux-qt',
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
]
- -
Id: 'rhel-9.4' Id: 'rhel-9.4'
Template: 'qtci-linux-RHEL-9.4-x86_64-50' Template: 'qtci-linux-RHEL-9.4-x86_64-50'

4
coin/platform_configs/cmake_platforms_static_release.yaml
View File

@@ -29,8 +29,8 @@ Configurations:
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
] ]
- -
Id: 'rhel-8.10-minimal-static-test' Id: 'rhel-9.6-minimal-static-test'
Template: 'qtci-linux-RHEL-8.10-x86_64-51' Template: 'qtci-linux-RHEL-9.6-x86_64-51'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests'] Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests']
Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'

4
coin/platform_configs/nightly_unity_builds.yaml
View File

@@ -13,8 +13,8 @@ Configurations:
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
] ]
- -
Id: 'rhel-8.10-unity-build' Id: 'rhel-9.6-unity-build'
Template: 'qtci-linux-RHEL-8.10-x86_64-50' Template: 'qtci-linux-RHEL-9.6-x86_64-51'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'

2
coin/platform_configs/tqtc-qtpip.yaml
View File

@@ -3,7 +3,7 @@ Module only: true
Include: [ Include: [
cmake_platforms.yaml: [ cmake_platforms.yaml: [
"windows-10_22h2-msvc2019", "windows-10_22h2-msvc2019",
"rhel-8.10" "rhel-9.6"
], ],
macos.yaml: [ macos.yaml: [
"macos-universal-on-arm64" "macos-universal-on-arm64"