diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 995f7729..73c54c68 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -258,18 +258,6 @@ Configurations: 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', 'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}', ] -- - 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.6' Template: 'qtci-linux-RHEL-9.6-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 799f9c2c..180d16ba 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -29,8 +29,8 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - - Id: 'rhel-8.10-minimal-static-test' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Id: 'rhel-9.6-minimal-static-test' + Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' 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' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 178b891a..bed542f0 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -13,8 +13,8 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - - Id: 'rhel-8.10-unity-build' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Id: 'rhel-9.6-unity-build' + Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' 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' diff --git a/coin/platform_configs/tqtc-qtpip.yaml b/coin/platform_configs/tqtc-qtpip.yaml index 17881c09..a3400688 100644 --- a/coin/platform_configs/tqtc-qtpip.yaml +++ b/coin/platform_configs/tqtc-qtpip.yaml @@ -3,7 +3,7 @@ Module only: true Include: [ cmake_platforms.yaml: [ "windows-10_22h2-msvc2019", - "rhel-8.10" + "rhel-9.6" ], macos.yaml: [ "macos-universal-on-arm64"