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

Remove Red Hat 9.2 from CI

Browse Source 
RHEL-9.2 targets are replaced by RHEL-9.4 targets in platform
configurations. [CI Platforms]

Pick-to: 6.8
Task-number: QTQAINFRA-6362
Change-Id: I9287309fe136e9aaae6c0c970cc0859dbfaf8635
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
This commit is contained in:
Elias Toivola
2024-10-03 13:23:56 +03:00
parent 490769cdef
commit 66f09bb69d
3 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coin/platform_configs/cmake_platforms.yaml
View File

@@ -212,17 +212,6 @@ Configurations:
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', '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' 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
] ]
-
Id: 'rhel-9.2'
Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', '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',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
]
- -
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/qmake2cmake.yaml
View File

@@ -9,10 +9,6 @@ Configurations:
Template: 'qtci-macos-13-x86_64-103' Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['DisableTests'] Features: ['DisableTests']
-
Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['DisableTests']
- -
Template: 'qtci-linux-RHEL-9.4-x86_64-50' Template: 'qtci-linux-RHEL-9.4-x86_64-50'
Compiler: 'GCC' Compiler: 'GCC'

13
coin/platform_configs/qtbase-new-compiler-testing.yaml
View File

@@ -1,17 +1,6 @@
Version: 2 Version: 2
Configurations: Configurations:
# Test gcc-12 on RHEL 9.2 # Test gcc-12 on RHEL 9.4
-
Id: 'rhel-9.2-gcc12'
Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
Environment variables: [
'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}',
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
]
- -
Id: 'rhel-9.4-gcc12' Id: 'rhel-9.4-gcc12'
Template: 'qtci-linux-RHEL-9.4-x86_64-50' Template: 'qtci-linux-RHEL-9.4-x86_64-50'