diff options
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 59 |
1 files changed, 19 insertions, 40 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index bb19de9..eeed640 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,31 +35,19 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.34.31933" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.34.31933" -.windows_vcvarsall_vs2022_x64_package: - variables: - VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" - VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.32.31326" - -.windows_vcvarsall_vs2022_x86_package: - variables: - VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" - VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.32.31326" - -.windows_vcvarsall_vs2022_x64_arm64_package: +.windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.34.31933" .windows_vs2022_x64_ninja: extends: @@ -80,7 +68,7 @@ .windows_x86_64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64_package + - .windows_vcvarsall_vs2022_x64 variables: CMAKE_CONFIGURATION: windows_x86_64_package @@ -88,7 +76,7 @@ .windows_i386_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x86_package + - .windows_vcvarsall_vs2022_x86 variables: CMAKE_CONFIGURATION: windows_i386_package @@ -96,7 +84,7 @@ .windows_arm64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64_arm64_package + - .windows_vcvarsall_vs2022_x64_arm64 variables: CMAKE_CONFIGURATION: windows_arm64_package @@ -110,7 +98,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.34.31933" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -244,7 +232,16 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.34 + - nonconcurrent + +.windows_tags_nonconcurrent_vs2022_arm64: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - vs2022 + - msvc-19.34-arm64 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -253,7 +250,7 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.34 - concurrent .windows_tags_concurrent_vs2019: @@ -272,24 +269,6 @@ - shell - concurrent -.windows_tags_x86_64_package: - tags: - - cmake # Since this is a bare runner, pin to a project. - - windows - - shell - - vs2022 - - msvc-19.32 - - nonconcurrent - -.windows_tags_arm64_package: - tags: - - cmake # Since this is a bare runner, pin to a project. - - windows - - shell - - vs2022 - - msvc-19.32-arm64 - - nonconcurrent - ## Windows-specific scripts .before_script_windows: &before_script_windows |