dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-06 07:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-intel-windows'

Browse Source 
fd8c782ded ci: Update to IntelLLVM 2024.1.0 on Windows
f28d88a351 ci: Fix tags of Intel and IntelLLVM jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9563
This commit is contained in:
Brad King
2024-05-31 13:26:49 +00:00
committed by Kitware Robot
parent 1e2b2a18a1 fd8c782ded
commit e2a3a0ad4b
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -1253,7 +1253,7 @@ t:windows-intel2021.9.0-ninja:
extends:
- .windows_intelclassic_ninja
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent
- .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1264,11 +1264,11 @@ t:windows-intel2021.9.0-ninja:
CMAKE_CI_BUILD_NAME: windows_intel2021.9.0_ninja
CMAKE_CI_JOB_NIGHTLY: "true"
t:windows-oneapi2023.1.0-ninja:
t:windows-oneapi2024.1.0-ninja:
extends:
- .windows_inteloneapi_ninja
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent
- .windows_x86_64_tags_concurrent_vs2022
- .cmake_junit_artifacts
- .run_dependent
dependencies:
@@ -1276,7 +1276,7 @@ t:windows-oneapi2023.1.0-ninja:
needs:
- t:windows-vs2022-x64-ninja
variables:
CMAKE_CI_BUILD_NAME: windows_oneapi2023.1.0_ninja
CMAKE_CI_BUILD_NAME: windows_oneapi2024.1.0_ninja
CMAKE_CI_JOB_NIGHTLY: "true"
t:mingw_osdn_io-mingw_makefiles:

24
.gitlab/ci/intel.ps1
View File

@@ -1,8 +1,19 @@
$erroractionpreference = "stop"
if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2023\.1\.0|intel2021\.9\.0)(_|$)") {
if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2024\.1\.0)(_|$)") {
# Intel oneAPI 2024.1.0
$version = "2024.1.0"
$version_dir = "2024.1"
$bin_dir = "bin"
$llvm_dir = "bin\compiler"
$filename = "intel-oneapi-$version-windows-1"
$sha256sum = "CB6857C08CD815722913358EC495AA575C2EED730646098A6CF7178E55FA7323"
} elseif ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(intel2021\.9\.0)(_|$)") {
# Intel oneAPI 2023.1.0
$version = "2023.1.0"
$version_dir = "2023.1.0"
$bin_dir = "windows\bin"
$llvm_dir = "windows\bin-llvm"
$filename = "intel-oneapi-$version-windows-1"
$sha256sum = "5AFCA9E0B03894565209B1295476163ABEBB1F1388E0F3EF5B4D0F9189E65BDC"
} else {
@@ -26,12 +37,12 @@ Move-Item -Path "$outdir\$filename" -Destination "$outdir\intel"
Remove-Item "$outdir\$tarball"
$compiler = "$outdir\intel\compiler"
$bin = "$compiler\$version\windows\bin"
$null = New-Item -ItemType Junction -Path "$compiler\latest" -Target "$compiler\$version"
$bin = "$compiler\$version_dir\$bin_dir"
$null = New-Item -ItemType Junction -Path "$compiler\latest" -Target "$compiler\$version_dir"
$null = New-Item -ItemType HardLink -Path "$bin\icx-cl.exe" -Target "$bin\icx.exe"
$null = New-Item -ItemType HardLink -Path "$bin\icx-cc.exe" -Target "$bin\icx.exe"
$null = New-Item -ItemType HardLink -Path "$bin\icpx.exe" -Target "$bin\icx.exe"
$bin = "$compiler\$version\windows\bin-llvm"
$bin = "$compiler\$version_dir\$llvm_dir"
$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++.exe" -Target "$bin\clang.exe"
@@ -40,3 +51,8 @@ $null = New-Item -ItemType HardLink -Path "$bin\ld.lld.exe" -Target "$bin\lld
$null = New-Item -ItemType HardLink -Path "$bin\llvm-lib.exe" -Target "$bin\llvm-ar.exe"
Clear-Variable -Name bin
Clear-Variable -Name compiler
Clear-Variable -Name llvm_dir
Clear-Variable -Name bin_dir
Clear-Variable -Name version_dir
Clear-Variable -Name version