From 4eaaaa7c7c91b6070e6e33b5aeb6b319a7c9cdc3 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 26 Nov 2021 09:31:15 +0200 Subject: Replace Windows 10 21H1 with Windows 10 21H2 in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tier 1 image includes all configurations from pre-provisioning folder. E.g. these are pre-provisioned: Visual Studio 2015 version 14.0.25420.1 Update 3 Visual Studio 2019 + build tools version 16.11.7 Visual Studio 2022 + build tools version 17.0.1 Task-number: QTQAINFRA-4651 Pick-to: 6.2 Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/platform_configs/cmake_platforms.yaml | 22 +++++++++++----------- .../cmake_platforms_static_tests.yaml | 2 +- ...make_platforms_target_android_host_windows.yaml | 16 ++++++++-------- coin/platform_configs/cmake_platforms_wasm.yaml | 4 ++-- coin/platform_configs/flashing-wizard.yaml | 4 ++-- coin/platform_configs/qt-creator.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- coin/platform_configs/qtwebkit.yaml | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index fbc18c37..5a99148e 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -62,7 +62,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", "Insignificant"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' @@ -78,7 +78,7 @@ Configurations: 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2022_PREVIEW' Features: ['Sccache', "DebugAndRelease", 'Insignificant'] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' @@ -115,17 +115,17 @@ Configurations: 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'] - - Id: 'Windows10_21H1-MSVC2019-x64-host' - Template: 'qtci-windows-10_21H1-x86_64-52' + Id: 'Windows10_21H2-MSVC2019-x64-host' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", "Insignificant"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant'] - Platform dependency: 'Windows10_21H1-MSVC2019-x64-host' + Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON', ] @@ -188,8 +188,8 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] - - Id: 'Windows10_21H1-Mingw11-x64-host' - Template: 'qtci-windows-10_21H1-x86_64-52' + Id: 'Windows10_21H2-Mingw11-x64-host' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' Features: ['Packaging', 'Sccache'] Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' @@ -206,8 +206,8 @@ Configurations: Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR=C:\llvm-mingw'] - - Id: 'Windows10_21H1-LLVM-x64-host' - Template: 'qtci-windows-10_21H1-x86_64-52' + Id: 'Windows10_21H2-LLVM-x64-host' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache'] Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' @@ -222,7 +222,7 @@ Configurations: Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw'] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Features: ['Sccache'] diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index c8075c85..8c3bc1e4 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -6,7 +6,7 @@ Configurations: Features: ['Sccache', 'MinimalStaticTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Sccache', 'MinimalStaticTests'] Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml index 948e23e2..ee238b1c 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -15,12 +15,12 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' ] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H1-Mingw11-x64-host' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', @@ -41,12 +41,12 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' ] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H1-Mingw11-x64-host' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', @@ -67,12 +67,12 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' ] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H1-Mingw11-x64-host' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', @@ -93,12 +93,12 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang' ] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H1-Mingw11-x64-host' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 1570475f..92da4b40 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -23,11 +23,11 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF'] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_21H1-Mingw11-x64-host' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index b123f630..0a4f41ec 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -7,7 +7,7 @@ Configurations: 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 -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'UseLegacyInstructions', 'Insignificant'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' @@ -18,7 +18,7 @@ Configurations: 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-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions', 'Insignificant'] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index ad9c89d0..74722426 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -9,7 +9,7 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'Insignificant'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index acc88bbf..a7fb9741 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' @@ -13,7 +13,7 @@ Configurations: Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions', 'Insignificant'] diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index a00e6ae7..7866010b 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -7,7 +7,7 @@ Configurations: Features: ['Packaging', UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' - - Template: 'qtci-windows-10_21H1-x86_64-52' + Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Features: ['Packaging', UseLegacyInstructions'] -- cgit v1.2.3