浏览代码

gitlab-ci: Update Windows builds to MSVC 19.31 toolset

Brad King 3 年之前
父节点
当前提交
fade5b5b8c
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      .gitlab/os-windows.yml

+ 4 - 4
.gitlab/os-windows.yml

@@ -35,7 +35,7 @@
     variables:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.30.30705"
+        VCVARSVERSION: "14.31.31103"
 
 
 .windows_vs2022_x64_ninja:
 .windows_vs2022_x64_ninja:
     extends:
     extends:
@@ -54,7 +54,7 @@
         CMAKE_CONFIGURATION: windows_vs2022_x64
         CMAKE_CONFIGURATION: windows_vs2022_x64
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "x64"
         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"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 .windows_vs2019_x64:
 .windows_vs2019_x64:
@@ -149,7 +149,7 @@
         - windows
         - windows
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-19.30
+        - msvc-19.31
         - nonconcurrent
         - nonconcurrent
 
 
 .windows_tags_concurrent_vs2022:
 .windows_tags_concurrent_vs2022:
@@ -158,7 +158,7 @@
         - windows
         - windows
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-19.30
+        - msvc-19.31
         - concurrent
         - concurrent
 
 
 .windows_tags_concurrent_vs2019:
 .windows_tags_concurrent_vs2019: