diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dce1ad173c..f61070e3f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1209,7 +1209,7 @@ t:windows-intel2021.9.0-ninja: extends: - .windows_intelclassic_ninja - .cmake_test_windows_external - - .windows_x86_64_tags_concurrent_vs2022 + - .windows_x86_64_tags_concurrent_vs2022_msvc14.43 - .cmake_junit_artifacts - .run_dependent needs: @@ -1222,7 +1222,7 @@ t:windows-oneapi2024.1.0-ninja: extends: - .windows_inteloneapi_ninja - .cmake_test_windows_external - - .windows_x86_64_tags_concurrent_vs2022 + - .windows_x86_64_tags_concurrent_vs2022_msvc14.43 - .cmake_junit_artifacts - .run_dependent needs: diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 89a5e4dda6..06785b0f64 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -31,29 +31,35 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.windows_vcvarsall_vs2022_x64: +.windows_vcvarsall_vs2022_x64_msvc14.43: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" VCVARSVERSION: "14.43.34808" +.windows_vcvarsall_vs2022_x64: + variables: + VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" + VCVARSPLATFORM: "x64" + VCVARSVERSION: "14.44.35207" + .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.43.34808" + VCVARSVERSION: "14.44.35207" .windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.43.34808" + VCVARSVERSION: "14.44.35207" .windows_arm64_vcvarsall_vs2022: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "arm64" - VCVARSVERSION: "14.43.34808" + VCVARSVERSION: "14.44.35207" .windows_vs2022_x64_pch: extends: @@ -119,7 +125,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -232,7 +238,7 @@ .windows_intelclassic_ninja: extends: - .windows_ninja - - .windows_vcvarsall_vs2022_x64 + - .windows_vcvarsall_vs2022_x64_msvc14.43 variables: CMAKE_CONFIGURATION: windows_intelclassic_ninja @@ -240,7 +246,7 @@ .windows_inteloneapi_ninja: extends: - .windows_ninja - - .windows_vcvarsall_vs2022_x64 + - .windows_vcvarsall_vs2022_x64_msvc14.43 variables: CMAKE_CONFIGURATION: windows_inteloneapi_ninja @@ -282,7 +288,7 @@ CMAKE_CONFIGURATION: windows_arm64_vs2022 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "ARM64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .mingw_osdn_io: @@ -316,7 +322,7 @@ - windows-x86_64 - shell - vs2022 - - msvc-14.43 + - msvc-14.44 - nonconcurrent .windows_x86_64_tags_nonconcurrent_vs2022_arm64: @@ -325,10 +331,19 @@ - windows-x86_64 - shell - vs2022 - - msvc-14.43-arm64 + - msvc-14.44-arm64 - nonconcurrent .windows_x86_64_tags_concurrent_vs2022: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows-x86_64 + - shell + - vs2022 + - msvc-14.44 + - concurrent + +.windows_x86_64_tags_concurrent_vs2022_msvc14.43: tags: - cmake # Since this is a bare runner, pin to a project. - windows-x86_64 @@ -344,7 +359,7 @@ - shell - vs2022 - vs17-android - - msvc-14.43 + - msvc-14.44 - concurrent .windows_x86_64_tags_concurrent_vs2019_android: @@ -370,7 +385,7 @@ - windows-arm64 - shell - vs2022 - - msvc-14.43 + - msvc-14.44 - nonconcurrent .windows_arm64_tags_concurrent_vs2022: @@ -379,7 +394,7 @@ - windows-arm64 - shell - vs2022 - - msvc-14.43 + - msvc-14.44 - concurrent ## Windows-specific scripts