mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 01:28:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows

Browse Source
This commit is contained in:
Brad King
2022-11-10 09:36:27 -05:00
parent 3eb94e4d51
commit 46b2849550
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+8 -8
View File
@@ -1000,7 +1000,7 @@ t:windows-borland5.8:
variables: variables:
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-clang13.0-cl-ninja: t:windows-clang15.0-cl-ninja:
extends: extends:
- .windows_clang_ninja - .windows_clang_ninja
- .cmake_test_windows_external - .cmake_test_windows_external
@@ -1012,10 +1012,10 @@ t:windows-clang13.0-cl-ninja:
needs: needs:
- t:windows-vs2022-x64-ninja - t:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_ninja CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_ninja
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-clang13.0-cl-nmake: t:windows-clang15.0-cl-nmake:
extends: extends:
- .windows_clang_nmake - .windows_clang_nmake
- .cmake_test_windows_external - .cmake_test_windows_external
@@ -1027,10 +1027,10 @@ t:windows-clang13.0-cl-nmake:
needs: needs:
- t:windows-vs2022-x64-ninja - t:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_BUILD_NAME: windows_clang13.0_cl_nmake CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_nmake
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-clang13.0-gnu-ninja: t:windows-clang15.0-gnu-ninja:
extends: extends:
- .windows_clang_ninja - .windows_clang_ninja
- .cmake_test_windows_external - .cmake_test_windows_external
@@ -1042,10 +1042,10 @@ t:windows-clang13.0-gnu-ninja:
needs: needs:
- t:windows-vs2022-x64-ninja - t:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_ninja CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_ninja
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-clang13.0-gnu-nmake: t:windows-clang15.0-gnu-nmake:
extends: extends:
- .windows_clang_nmake - .windows_clang_nmake
- .cmake_test_windows_external - .cmake_test_windows_external
@@ -1057,7 +1057,7 @@ t:windows-clang13.0-gnu-nmake:
needs: needs:
- t:windows-vs2022-x64-ninja - t:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_BUILD_NAME: windows_clang13.0_gnu_nmake CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_nmake
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-msvc-v71-nmake: t:windows-msvc-v71-nmake:
.gitlab/ci/clang.ps1
+9 -5
View File
@@ -1,10 +1,10 @@
$erroractionpreference = "stop" $erroractionpreference = "stop"
if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang13.0")) { if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang15.0")) {
# LLVM/Clang 13.0 # LLVM/Clang 15.0
# https://github.com/llvm/llvm-project/releases/tag/llvmorg-13.0.0 # https://github.com/llvm/llvm-project/releases/tag/llvmorg-15.0.4
$filename = "llvm-13.0.0-win-x86_64-1" $filename = "llvm-15.0.4-win-x86_64-1"
$sha256sum = "F1B7CE360DACBC9776D7F84BE714766D60CF3D47492AFE34C45D574D1C597264" $sha256sum = "9AA305084C20C27972E103E7B18AAC3F755E0534542AF62FC2F2BF5DDD3C4E1F"
} else { } else {
throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME") throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME")
} }
@@ -25,6 +25,7 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem
Move-Item -Path "$outdir\$filename" -Destination "$outdir\llvm" Move-Item -Path "$outdir\$filename" -Destination "$outdir\llvm"
$bin = "$outdir\llvm\bin" $bin = "$outdir\llvm\bin"
$lib = "$outdir\llvm\lib"
$null = New-Item -ItemType HardLink -Path "$bin\clang++.exe" -Target "$bin\clang.exe" $null = New-Item -ItemType HardLink -Path "$bin\clang++.exe" -Target "$bin\clang.exe"
$null = New-Item -ItemType HardLink -Path "$bin\clang-cl.exe" -Target "$bin\clang.exe" $null = New-Item -ItemType HardLink -Path "$bin\clang-cl.exe" -Target "$bin\clang.exe"
$null = New-Item -ItemType HardLink -Path "$bin\clang-cpp.exe" -Target "$bin\clang.exe" $null = New-Item -ItemType HardLink -Path "$bin\clang-cpp.exe" -Target "$bin\clang.exe"
@@ -34,4 +35,7 @@ $null = New-Item -ItemType HardLink -Path "$bin\lld-link.exe" -Target "$bin\
$null = New-Item -ItemType HardLink -Path "$bin\llvm-lib.exe" -Target "$bin\llvm-ar.exe" $null = New-Item -ItemType HardLink -Path "$bin\llvm-lib.exe" -Target "$bin\llvm-ar.exe"
$null = New-Item -ItemType HardLink -Path "$bin\llvm-ranlib.exe" -Target "$bin\llvm-ar.exe" $null = New-Item -ItemType HardLink -Path "$bin\llvm-ranlib.exe" -Target "$bin\llvm-ar.exe"
$null = New-Item -ItemType HardLink -Path "$bin\llvm-objcopy.exe" -Target "$bin\llvm-strip.exe" $null = New-Item -ItemType HardLink -Path "$bin\llvm-objcopy.exe" -Target "$bin\llvm-strip.exe"
$null = New-Item -ItemType HardLink -Path "$bin\libiomp5md.dll" -Target "$bin\libomp.dll"
$null = New-Item -ItemType HardLink -Path "$lib\libiomp5md.lib" -Target "$lib\libomp.lib"
Clear-Variable -Name bin Clear-Variable -Name bin
Clear-Variable -Name lib