From 15dc1a357b2d71250e497d94e05689dbe4947a72 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 22 Aug 2024 11:23:18 -0400
Subject: ci: Update LLVM/Clang to 18.1 in nightly CI jobs on Windows

---
 .gitlab-ci.yml       | 16 ++++++++--------
 .gitlab/ci/clang.ps1 | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85ef4e7..2cb55f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1209,7 +1209,7 @@ t:windows-borland5.8:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang17.0-cl-ninja:
+t:windows-clang18.1-cl-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1221,10 +1221,10 @@ t:windows-clang17.0-cl-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang17.0_cl_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang18.1_cl_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang17.0-cl-nmake:
+t:windows-clang18.1-cl-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1236,10 +1236,10 @@ t:windows-clang17.0-cl-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang17.0_cl_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang18.1_cl_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang17.0-gnu-ninja:
+t:windows-clang18.1-gnu-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1251,10 +1251,10 @@ t:windows-clang17.0-gnu-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang17.0_gnu_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang18.1_gnu_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang17.0-gnu-nmake:
+t:windows-clang18.1-gnu-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1266,7 +1266,7 @@ t:windows-clang17.0-gnu-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang17.0_gnu_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang18.1_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 204bff5..5e3ff3c 100644
--- a/.gitlab/ci/clang.ps1
+++ b/.gitlab/ci/clang.ps1
@@ -1,10 +1,10 @@
 $erroractionpreference = "stop"
 
-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"
+if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang18.1")) {
+    # LLVM/Clang 18.1.8
+    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.8
+    $filename = "llvm-18.1.8-win-x86_64-1"
+    $sha256sum = "AAB44C676DEDC7D36F90073DB6DE5C573F21D2F98D0B48269507478A63D48CA0"
 } else {
     throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME")
 }
-- 
cgit v0.12