From 9c0a91c301f6588b06c24e4a5fefbbbd10f131c5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Aug 2022 07:27:14 +0300 Subject: Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1 Older version seems to have issues with installer when updating the visual studio and buildtools versions through installer via command line. Task-number: QTQAINFRA-5090 Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6 Reviewed-by: Qt CI Bot Reviewed-by: Oliver Wolff (cherry picked from commit 0507008ff656f2989e9649293c49b76880bd9406) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index fdeedcf1..6b16fd06 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -51,7 +51,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -68,7 +68,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -102,7 +102,7 @@ Configurations: ] - Id: 'Windows11_21H2-MSVC2019-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' @@ -110,7 +110,7 @@ Configurations: 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] @@ -170,7 +170,7 @@ Configurations: ] - Id: 'Windows11_21H2-LLVM-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' @@ -192,7 +192,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Mingw' Features: ['Sccache', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' -- cgit v1.2.3