From 3ea24a5f486dc217d641abe0b3cd73ad8db7434a Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 3 Oct 2025 16:17:28 +0300 Subject: [PATCH] Provisioning: Add MinGW to Windows 11 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-7463 Task-number: QTQAINFRA-7462 Pick-to: 6.10 6.8 6.5 Change-Id: I5d1edf4700bcc37fb5700fc7000eaaf6be8d4fc2 Reviewed-by: Matti Paaso Reviewed-by: Aku Pietikäinen --- coin/platform_configs/cmake_platforms.yaml | 34 +++++++++++++++++++ .../cmake_platforms_target_android.yaml | 16 +++++++++ .../cmake_platforms_wasm.yaml | 15 ++++++++ .../nightly_android_ndk1.yaml | 14 +++++++- .../nightly_android_ndk2.yaml | 14 +++++++- .../nightly_qnx710_host_windows.yaml | 18 +++++++++- .../qtsaferenderer-runtime.yaml | 1 + coin/platform_configs/qtsaferenderer.yaml | 1 + .../tqtc-android-automotive.yaml | 2 ++ 9 files changed, 112 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 24bd88c6..e7b46c9d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -220,6 +220,27 @@ Configurations: '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}}', + '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-x86_64-arm64-tests' Template: 'qtci-windows-11_23H2-aarch64-53' @@ -303,6 +324,19 @@ Configurations: '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' + 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-llvm' 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 a23f0a7a..43c5a5db 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -31,6 +31,22 @@ Configurations: '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' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'windows-11_24h2-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-9-x86-on-linux' Template: 'qtci-linux-RHEL-8.10-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 57d7a4c8..9911c5f1 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -28,6 +28,21 @@ Configurations: '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' + Target compiler: 'Clang' + Platform dependency: 'windows-11_24h2-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-linux-thread' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' diff --git a/coin/platform_configs/nightly_android_ndk1.yaml b/coin/platform_configs/nightly_android_ndk1.yaml index 4ae4c9fc..91328127 100644 --- a/coin/platform_configs/nightly_android_ndk1.yaml +++ b/coin/platform_configs/nightly_android_ndk1.yaml @@ -2,12 +2,14 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.10', - 'windows-10_22h2-mingw13' + '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: [ @@ -47,6 +49,16 @@ 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 2441d047..ed0584ab 100644 --- a/coin/platform_configs/nightly_android_ndk2.yaml +++ b/coin/platform_configs/nightly_android_ndk2.yaml @@ -2,12 +2,14 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.10', - 'windows-10_22h2-mingw13' + '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: [ @@ -47,6 +49,16 @@ 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 13428308..f4e50f1c 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -1,7 +1,8 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - windows-10_22h2-mingw13 + 'windows-10_22h2-mingw13', + 'windows-11_24h2-mingw13' ] ] Configurations: @@ -20,3 +21,18 @@ Configurations: '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' + Compiler: 'Mingw' + Target compiler: 'QCC' + Platform dependency: 'windows-11_24h2-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' + ] diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index c9bc2a91..0dfb16c0 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -13,6 +13,7 @@ Include: [ "windows-10_22h2-msvc2022", "rhel-8.10", "windows-10_22h2-mingw13", + "windows-11_24h2-mingw13", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", "windows-11_24H2-msvc2022", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 5c36ac0c..ce30d27b 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -14,6 +14,7 @@ Include: [ "windows-10_22h2-msvc2022", "rhel-8.10", "windows-10_22h2-mingw13", + "windows-11_24h2-mingw13", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", "windows-11_24H2-msvc2022", diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 50790fc5..77f192ac 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -4,6 +4,7 @@ Include: [ "documentation-warnings", "rhel-8.10", 'windows-10_22h2-mingw13', + 'windows-11_24h2-mingw13', ], macos.yaml: [ 'macos-universal-on-arm64' @@ -11,6 +12,7 @@ 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' ],