diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-19 19:25:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-19 19:26:07 (GMT) |
| commit | 4c92fc709a6a99ca569da0670314629deed71778 (patch) | |
| tree | 3310087f250c17fa2111fc59ef889528915c099a | |
| parent | 9e641b73c137c2073884e5049c79acb982fda031 (diff) | |
| download | CMake-4c92fc709a6a99ca569da0670314629deed71778.zip CMake-4c92fc709a6a99ca569da0670314629deed71778.tar.gz CMake-4c92fc709a6a99ca569da0670314629deed71778.tar.bz2 | |
ci: Update LLVM/Clang to 17.0 in nightly CI jobs on Windows
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rwxr-xr-x | .gitlab/ci/clang.ps1 | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a66494..39a73a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1157,7 +1157,7 @@ t:windows-borland5.8: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang16.0-cl-ninja: +t:windows-clang17.0-cl-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1169,10 +1169,10 @@ t:windows-clang16.0-cl-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_ninja + CMAKE_CI_BUILD_NAME: windows_clang17.0_cl_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang16.0-cl-nmake: +t:windows-clang17.0-cl-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1184,10 +1184,10 @@ t:windows-clang16.0-cl-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_nmake + CMAKE_CI_BUILD_NAME: windows_clang17.0_cl_nmake CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang16.0-gnu-ninja: +t:windows-clang17.0-gnu-ninja: extends: - .windows_clang_ninja - .cmake_test_windows_external @@ -1199,10 +1199,10 @@ t:windows-clang16.0-gnu-ninja: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_ninja + CMAKE_CI_BUILD_NAME: windows_clang17.0_gnu_ninja CMAKE_CI_JOB_NIGHTLY: "true" -t:windows-clang16.0-gnu-nmake: +t:windows-clang17.0-gnu-nmake: extends: - .windows_clang_nmake - .cmake_test_windows_external @@ -1214,7 +1214,7 @@ t:windows-clang16.0-gnu-nmake: needs: - t:windows-vs2022-x64-ninja variables: - CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_nmake + CMAKE_CI_BUILD_NAME: windows_clang17.0_gnu_nmake CMAKE_CI_JOB_NIGHTLY: "true" t:windows-intel2021.9.0-ninja: diff --git a/.gitlab/ci/clang.ps1 b/.gitlab/ci/clang.ps1 index 1fc8d8e..e455ebc 100755 --- a/.gitlab/ci/clang.ps1 +++ b/.gitlab/ci/clang.ps1 @@ -1,10 +1,10 @@ $erroractionpreference = "stop" -if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang16.0")) { - # LLVM/Clang 16.0 - # https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.0 - $filename = "llvm-16.0.0-win-x86_64-1" - $sha256sum = "13F48356BA5892A82E8BB25EB283FDDAA8F23A0F209B6BF6525D2C5E1285B950" +if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang17.0")) { + # LLVM/Clang 17.0.1 + # https://github.com/llvm/llvm-project/releases/tag/llvmorg-17.0.1 + $filename = "llvm-17.0.1-win-x86_64-1" + $sha256sum = "803F5D7291219BE60D2EE69CE8882341F94A8707A214DED190614895B6996F55" } else { throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME") } |