From fade5b5b8cbaae7ee8bc60871dc647280bad078b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 9 Mar 2022 08:46:44 -0500 Subject: gitlab-ci: Update Windows builds to MSVC 19.31 toolset --- .gitlab/os-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 2bce8c876e..aa971f8aac 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,7 +35,7 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.30.30705" + VCVARSVERSION: "14.31.31103" .windows_vs2022_x64_ninja: extends: @@ -54,7 +54,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.31.31103" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -149,7 +149,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -158,7 +158,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - concurrent .windows_tags_concurrent_vs2019: -- cgit v1.2.1 From e66de431805dd56609587fd24ccf1a0753058803 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 9 Mar 2022 08:46:44 -0500 Subject: gitlab-ci: Update Windows builds to MSVC 19.31 toolset --- .gitlab/os-windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index a1194331bf..806e7ca72c 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -38,7 +38,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64_ninja VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.30.30705" + VCVARSVERSION: "14.31.31103" ### External testing @@ -49,7 +49,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.31.31103" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" ## Tags @@ -60,7 +60,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -69,7 +69,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - concurrent ## Windows-specific scripts -- cgit v1.2.1