diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 98aa8aed..7bc1b1bb 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -179,16 +179,6 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] -- - Id: 'rhel-8.8' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', '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' - ] - Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index ecc0fe69..4daaa913 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,29 +33,13 @@ Configurations: ] - Id: 'android-9-x86-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_api_28' - ] -- - Id: 'android-9-x86-on-linux-rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -65,12 +49,12 @@ Configurations: ] - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' + Platform dependency: 'rhel-8.10' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', @@ -79,19 +63,3 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_34' ] -- - Id: 'android-14-x86_64-on-linux-rhel-8.10' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_64_api_34' - ] diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 46595c72..f013f079 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -23,11 +23,6 @@ Configurations: Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - 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-RHEL-8.10-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 02fa300a..305ef475 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,21 +2,6 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=', - 'ANDROID_EMULATOR=emulator_x86_api_28'] -- - Id: 'android-x86-developer-build-testrun-on-linux-rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 789bde7f..b6b88d97 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -2,13 +2,13 @@ Version: 2 Configurations: - Id: 'android-9-multi-abi' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: [ - 'rhel-8.8', + 'rhel-8.10', 'android-9-x86-on-linux', 'android-14-x86_64-on-linux' ] @@ -20,35 +20,9 @@ Configurations: 'InstallDepsPerPlatformSubdir' ] Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', + 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] -- - Id: 'android-9-multi-abi-rhel-8.10' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: [ - 'rhel-8.10', - 'android-9-x86-on-linux-rhel-8.10', - 'android-14-x86_64-on-linux-rhel-8.10' - ] - Features: [ - 'Sccache', - 'WarningsAreErrors', - 'AndroidTestRun', - 'MinimalAndroidMultiABITests', - 'InstallDepsPerPlatformSubdir' - ] - Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux-rhel-8.10', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux-rhel-8.10', - 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', - 'ANDROID_EMULATOR=emulator_x86_api_28' - ] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 0416187b..d55cf569 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -15,12 +15,6 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] -- - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] - Configure arguments: '' - Environment variables: [] - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 29cee966..577949db 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -13,7 +13,6 @@ Include: [ "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", - "rhel-8.8", "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-mingw13-developer-build", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 87eae1c2..c1695f69 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -12,7 +12,6 @@ Include: [ "sles-15_sp5-static", "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", - "rhel-8.8", "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-llvm", @@ -36,16 +35,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' ] -- - Id: 'Linux-RHEL_8_8_Static' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] - Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' - ] - Id: 'Linux-RHEL_8_10_Static' Template: 'qtci-linux-RHEL-8.10-x86_64-50' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index ec4e54e6..84543678 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.8', "rhel-8.10", 'windows-10_22h2-mingw13', 'ubuntu-22.04-documentation', @@ -14,30 +13,12 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-9-x86-on-linux-rhel-8.10', - 'android-14-x86_64-on-linux', - 'android-14-x86_64-on-linux-rhel-8.10' + 'android-14-x86_64-on-linux' ] ] Configurations: - Id: "automotive-android-14-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' - ] -- - Id: "automotive-android-14-x86_64-on-linux-rhel-8.10" Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -54,22 +35,6 @@ Configurations: ] - Id: "automotive-android-10-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29' - ] -- - Id: "automotive-android-10-x86_64-on-linux-rhel-8.10" Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' diff --git a/coin/platform_configs/tqtc-qtpip.yaml b/coin/platform_configs/tqtc-qtpip.yaml index f70579aa..480888ab 100644 --- a/coin/platform_configs/tqtc-qtpip.yaml +++ b/coin/platform_configs/tqtc-qtpip.yaml @@ -3,8 +3,7 @@ Module only: true Include: [ cmake_platforms.yaml: [ "windows-10_22h2-msvc2019", - "rhel-8.10", - "rhel-8.8" + "rhel-8.10" ], macos.yaml: [ "macos-universal-on-x86_64"