aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-08-09 07:27:14 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-17 16:01:17 +0000
commit4d6eb0d26d51c7b7a63d905bfaf7b3cf0556a9b5 (patch)
tree93d7184e8deba9108c9a8a19cf2eaf5599e01262
parent529df4c2d976e6a0fc7335948ae911ac98e025f5 (diff)
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 <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 0507008ff656f2989e9649293c49b76880bd9406) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index f2c32cfe..3bc5bd0f 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/ci-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'
@@ -103,7 +103,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", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
@@ -111,7 +111,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']
@@ -173,7 +173,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'
@@ -195,7 +195,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', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'