浏览代码

Merge topic 'ci-msvc-14.43' into release-3.31

8353a88661 ci: Update Windows builds to MSVC 14.43 toolset

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10336
Brad King 8 月之前
父节点
当前提交
c3735f37da
共有 1 个文件被更改,包括 12 次插入12 次删除
  1. 12 12
      .gitlab/os-windows.yml

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

@@ -35,25 +35,25 @@
     variables:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.42.34433"
+        VCVARSVERSION: "14.43.34808"
 
 
 .windows_vcvarsall_vs2022_x86:
 .windows_vcvarsall_vs2022_x86:
     variables:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x86"
         VCVARSPLATFORM: "x86"
-        VCVARSVERSION: "14.42.34433"
+        VCVARSVERSION: "14.43.34808"
 
 
 .windows_vcvarsall_vs2022_x64_arm64:
 .windows_vcvarsall_vs2022_x64_arm64:
     variables:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64_arm64"
         VCVARSPLATFORM: "x64_arm64"
-        VCVARSVERSION: "14.42.34433"
+        VCVARSVERSION: "14.43.34808"
 
 
 .windows_arm64_vcvarsall_vs2022:
 .windows_arm64_vcvarsall_vs2022:
     variables:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "arm64"
         VCVARSPLATFORM: "arm64"
-        VCVARSVERSION: "14.42.34433"
+        VCVARSVERSION: "14.43.34808"
 
 
 .windows_vs2022_x64_pch:
 .windows_vs2022_x64_pch:
     extends:
     extends:
@@ -119,7 +119,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.42.34433"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 .windows_vs2019_x64:
 .windows_vs2019_x64:
@@ -282,7 +282,7 @@
         CMAKE_CONFIGURATION: windows_arm64_vs2022
         CMAKE_CONFIGURATION: windows_arm64_vs2022
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "ARM64"
         CMAKE_GENERATOR_PLATFORM: "ARM64"
-        CMAKE_GENERATOR_TOOLSET: "v143,version=14.42.34433"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 
 .mingw_osdn_io:
 .mingw_osdn_io:
@@ -316,7 +316,7 @@
         - windows-x86_64
         - windows-x86_64
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-14.42
+        - msvc-14.43
         - nonconcurrent
         - nonconcurrent
 
 
 .windows_x86_64_tags_nonconcurrent_vs2022_arm64:
 .windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@@ -325,7 +325,7 @@
         - windows-x86_64
         - windows-x86_64
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-14.42-arm64
+        - msvc-14.43-arm64
         - nonconcurrent
         - nonconcurrent
 
 
 .windows_x86_64_tags_concurrent_vs2022:
 .windows_x86_64_tags_concurrent_vs2022:
@@ -334,7 +334,7 @@
         - windows-x86_64
         - windows-x86_64
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-14.42
+        - msvc-14.43
         - concurrent
         - concurrent
 
 
 .windows_x86_64_tags_concurrent_vs2022_android:
 .windows_x86_64_tags_concurrent_vs2022_android:
@@ -344,7 +344,7 @@
         - shell
         - shell
         - vs2022
         - vs2022
         - vs17-android
         - vs17-android
-        - msvc-14.42
+        - msvc-14.43
         - concurrent
         - concurrent
 
 
 .windows_x86_64_tags_concurrent_vs2019_android:
 .windows_x86_64_tags_concurrent_vs2019_android:
@@ -370,7 +370,7 @@
         - windows-arm64
         - windows-arm64
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-14.42
+        - msvc-14.43
         - nonconcurrent
         - nonconcurrent
 
 
 .windows_arm64_tags_concurrent_vs2022:
 .windows_arm64_tags_concurrent_vs2022:
@@ -379,7 +379,7 @@
         - windows-arm64
         - windows-arm64
         - shell
         - shell
         - vs2022
         - vs2022
-        - msvc-14.42
+        - msvc-14.43
         - concurrent
         - concurrent
 
 
 ## Windows-specific scripts
 ## Windows-specific scripts