mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-16 22:37:30 +08:00
ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset
Intel 2024.1 tools do not work with the MSVC 14.44 standard library.
This commit is contained in:
@@ -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:
|
||||
|
@@ -31,6 +31,12 @@
|
||||
CMAKE_CI_BUILD_TYPE: Release
|
||||
CTEST_NO_WARNINGS_ALLOWED: 1
|
||||
|
||||
.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"
|
||||
@@ -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
|
||||
@@ -337,6 +343,15 @@
|
||||
- msvc-14.43
|
||||
- concurrent
|
||||
|
||||
.windows_x86_64_tags_concurrent_vs2022_msvc14.43:
|
||||
tags:
|
||||
- cmake # Since this is a bare runner, pin to a project.
|
||||
- windows-x86_64
|
||||
- shell
|
||||
- vs2022
|
||||
- msvc-14.43
|
||||
- concurrent
|
||||
|
||||
.windows_x86_64_tags_concurrent_vs2022_android:
|
||||
tags:
|
||||
- cmake # Since this is a bare runner, pin to a project.
|
||||
|
Reference in New Issue
Block a user