Browse Source

ci: Update to IntelLLVM 2025.1 on Windows

Brad King 7 months ago
parent
commit
ebeee21983
3 changed files with 9 additions and 9 deletions
  1. 3 3
      .gitlab-ci.yml
  2. 5 5
      .gitlab/ci/intel.ps1
  3. 1 1
      .gitlab/os-windows.yml

+ 3 - 3
.gitlab-ci.yml

@@ -1337,17 +1337,17 @@ t:windows-intel2021.9.0-ninja:
         CMAKE_CI_BUILD_NAME: windows_intel2021.9.0_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-oneapi2024.1.0-ninja:
+t:windows-oneapi2025.1-ninja:
     extends:
         - .windows_inteloneapi_ninja
         - .cmake_test_windows_external
-        - .windows_x86_64_tags_concurrent_vs2022_msvc14.43
+        - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_oneapi2024.1.0_ninja
+        CMAKE_CI_BUILD_NAME: windows_oneapi2025.1_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:mingw_osdn_io-mingw_makefiles:

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

@@ -1,13 +1,13 @@
 $erroractionpreference = "stop"
 
-if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2024\.1\.0)(_|$)") {
-    # Intel oneAPI 2024.1.0
-    $version = "2024.1.0"
-    $version_dir = "2024.1"
+if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2025\.1)(_|$)") {
+    # Intel oneAPI 2025.1.2
+    $version = "2025.1.2"
+    $version_dir = "2025.1"
     $bin_dir = "bin"
     $llvm_dir = "bin\compiler"
     $filename = "intel-oneapi-$version-windows-1"
-    $sha256sum = "CB6857C08CD815722913358EC495AA575C2EED730646098A6CF7178E55FA7323"
+    $sha256sum = "CA7D5B4E5C11AA9FAF6ED56045D2440F620A2DA3D8BF2B8B644280C9B10DE844"
 } elseif ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(intel2021\.9\.0)(_|$)") {
     # Intel oneAPI 2023.1.0
     $version = "2023.1.0"

+ 1 - 1
.gitlab/os-windows.yml

@@ -246,7 +246,7 @@
 .windows_inteloneapi_ninja:
     extends:
         - .windows_ninja
-        - .windows_vcvarsall_vs2022_x64_msvc14.43
+        - .windows_vcvarsall_vs2022_x64
 
     variables:
         CMAKE_CONFIGURATION: windows_inteloneapi_ninja