Browse Source

Merge topic 'ci-clang19-windows'

96bcf7db16 ci: Update LLVM/Clang to 19.1 in nightly CI jobs on Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9834
Brad King 1 year ago
parent
commit
7fe17adf8d
2 changed files with 13 additions and 13 deletions
  1. 8 8
      .gitlab-ci.yml
  2. 5 5
      .gitlab/ci/clang.ps1

+ 8 - 8
.gitlab-ci.yml

@@ -1209,7 +1209,7 @@ t:windows-borland5.8:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang18.1-cl-ninja:
+t:windows-clang19.1-cl-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1221,10 +1221,10 @@ t:windows-clang18.1-cl-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang18.1_cl_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang19.1_cl_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang18.1-cl-nmake:
+t:windows-clang19.1-cl-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1236,10 +1236,10 @@ t:windows-clang18.1-cl-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang18.1_cl_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang19.1_cl_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang18.1-gnu-ninja:
+t:windows-clang19.1-gnu-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1251,10 +1251,10 @@ t:windows-clang18.1-gnu-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang18.1_gnu_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang19.1_gnu_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang18.1-gnu-nmake:
+t:windows-clang19.1-gnu-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1266,7 +1266,7 @@ t:windows-clang18.1-gnu-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang18.1_gnu_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang19.1_gnu_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:windows-intel2021.9.0-ninja:

+ 5 - 5
.gitlab/ci/clang.ps1

@@ -1,10 +1,10 @@
 $erroractionpreference = "stop"
 
-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"
+if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang19.1")) {
+    # LLVM/Clang 19.1.0
+    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.0
+    $filename = "llvm-19.1.0-win-x86_64-1"
+    $sha256sum = "C1F974511A6FA2DC5B4892996C064A55BF81D7F244514F8AB5A453110ADEC0EC"
 } else {
     throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME")
 }