diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 13:26:21 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-11 08:26:32 -0500 |
| commit | b0f02511e59bc02441f6211ea1ca8810d0ee77a5 (patch) | |
| tree | 0dd3dbc7c16bc725c1981e3e71969727c9ce60e0 /.gitlab-ci.yml | |
| parent | f2b438cb0afb577ee87c8bc2295ed3d263fc85f2 (diff) | |
| parent | 46b2849550821353f1eb513527c1f47dc761cc68 (diff) | |
| download | cmake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.tar.gz | |
Merge topic 'ci-clang15-windows'
46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows
8ba5835c8d ci: Factor out helper to load clang into environment on Windows
bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows
93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7897
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f732a082a..644d8711ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1000,10 +1000,10 @@ t:windows-borland5.8: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-cl-ninja: +t:windows-clang15.0-cl-ninja: extends: - .windows_clang_ninja - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1012,13 +1012,13 @@ t:windows-clang13.0-cl-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_ninja + CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-cl-nmake: +t:windows-clang15.0-cl-nmake: extends: - .windows_clang_nmake - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1027,13 +1027,13 @@ t:windows-clang13.0-cl-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_nmake + CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_nmake CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-gnu-ninja: +t:windows-clang15.0-gnu-ninja: extends: - .windows_clang_ninja - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1042,13 +1042,13 @@ t:windows-clang13.0-gnu-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_ninja + CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang13.0-gnu-nmake: +t:windows-clang15.0-gnu-nmake: extends: - .windows_clang_nmake - - .cmake_test_windows_clang + - .cmake_test_windows_external - .windows_tags_concurrent - .cmake_junit_artifacts - .run_dependent @@ -1057,7 +1057,7 @@ t:windows-clang13.0-gnu-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_nmake + CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_nmake CMAKE_CI_JOB_NIGHTLY: "true" t:mingw_osdn_io-mingw_makefiles: |