diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e7b46c9d..062d24e4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -205,27 +205,6 @@ Configurations: Compiler: 'MSVC2022' Target arch: 'arm64' Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Platform dependency: 'windows-10_22h2-mingw13' - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', - 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', - 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', - 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', - 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', - ] -- - Id: 'windows-11_24H2-msvc2022-arm64-new' - Template: 'qtci-windows-11_24H2-x86_64-71' - Compiler: 'MSVC2022' - Target arch: 'arm64' - Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-11_24h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -311,19 +290,6 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang', ] -- - Id: 'windows-10_22h2-mingw13' - Template: 'qtci-windows-10_22H2-x86_64-53' - Compiler: 'Mingw' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', - ] - Id: 'windows-11_24h2-mingw13' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 43c5a5db..baad1b4a 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -17,22 +17,6 @@ Configurations: ] - Id: 'android-armv7-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-53' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' - ] -- - Id: 'android-armv7-on-windows-new' Template: 'qtci-windows-11_24H2-x86_64-71' Target os: 'Android_ANY' Target arch: 'armv7' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 9911c5f1..acc120fd 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -15,21 +15,6 @@ Configurations: ] - Id: 'webassembly-windows' - Template: 'qtci-windows-10_22H2-x86_64-53' - Target os: 'WebAssembly' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include', - ] -- - Id: 'webassembly-windows-new' Template: 'qtci-windows-11_24H2-x86_64-71' Target os: 'WebAssembly' Compiler: 'Mingw' diff --git a/coin/platform_configs/nightly_android_ndk1.yaml b/coin/platform_configs/nightly_android_ndk1.yaml index 91328127..2e86a934 100644 --- a/coin/platform_configs/nightly_android_ndk1.yaml +++ b/coin/platform_configs/nightly_android_ndk1.yaml @@ -2,14 +2,12 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.10', - 'windows-10_22h2-mingw13', 'windows-11_24h2-mingw13' ], cmake_platforms_target_android.yaml: [ 'android-15-x86_64-on-linux', 'android-9-x86-on-linux', 'android-armv7-on-windows', - 'android-armv7-on-windows-new', 'android-arm64-on-macos' ], macos.yaml: [ @@ -49,16 +47,6 @@ Overrides: 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}' ] -- - Id: 'android-armv7-on-windows-new' - Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}' - ] - Id: 'android-arm64-on-macos' Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] diff --git a/coin/platform_configs/nightly_android_ndk2.yaml b/coin/platform_configs/nightly_android_ndk2.yaml index ed0584ab..0fb78c5b 100644 --- a/coin/platform_configs/nightly_android_ndk2.yaml +++ b/coin/platform_configs/nightly_android_ndk2.yaml @@ -2,14 +2,12 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.10', - 'windows-10_22h2-mingw13', 'windows-11_24h2-mingw13' ], cmake_platforms_target_android.yaml: [ 'android-15-x86_64-on-linux', 'android-9-x86-on-linux', 'android-armv7-on-windows', - 'android-armv7-on-windows-new', 'android-arm64-on-macos' ], macos.yaml: [ @@ -49,16 +47,6 @@ Overrides: 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}' ] -- - Id: 'android-armv7-on-windows-new' - Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}' - ] - Id: 'android-arm64-on-macos' Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index f4e50f1c..234c685d 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -1,28 +1,12 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'windows-10_22h2-mingw13', 'windows-11_24h2-mingw13' ] ] Configurations: - Id: 'qnx-710-arm64-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-53' - Target os: 'QNX_710' - Target arch: 'arm64' - Compiler: 'Mingw' - Target compiler: 'QCC' - Platform dependency: 'windows-10_22h2-mingw13' - Features: ['DisableTests', 'UseConfigure'] - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch', - 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include' - ] -- - Id: 'qnx-710-arm64-on-windows-new' Template: 'qtci-windows-11_24H2-x86_64-71' Target os: 'QNX_710' Target arch: 'arm64' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index fe253a3a..664410f6 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -12,7 +12,6 @@ Include: [ "sles-15_sp6-static", "windows-10_22h2-msvc2022", "rhel-9.4", - "windows-10_22h2-mingw13", "windows-11_24h2-mingw13", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index e44a3699..738d7041 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -13,7 +13,6 @@ Include: [ "sles-15_sp6-static", "windows-10_22h2-msvc2022", "rhel-9.4", - "windows-10_22h2-mingw13", "windows-11_24h2-mingw13", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 77f192ac..fdbd540b 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -3,7 +3,6 @@ Include: [ cmake_platforms.yaml: [ "documentation-warnings", "rhel-8.10", - 'windows-10_22h2-mingw13', 'windows-11_24h2-mingw13', ], macos.yaml: [ @@ -12,7 +11,6 @@ Include: [ cmake_platforms_target_android.yaml: [ 'android-arm64-on-macos', 'android-armv7-on-windows', - 'android-armv7-on-windows-new', 'android-9-x86-on-linux', 'android-15-x86_64-on-linux' ],