Browse Source

gitlab-ci: Add job testing Intel 2021.9.0 compilers on Windows

Brad King 2 years ago
parent
commit
195339e7ac

+ 15 - 0
.gitlab-ci.yml

@@ -1178,6 +1178,21 @@ t:windows-clang16.0-gnu-nmake:
         CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
+t:windows-intel2021.9.0-ninja:
+    extends:
+        - .windows_intelclassic_ninja
+        - .cmake_test_windows_external
+        - .windows_x86_64_tags_concurrent
+        - .cmake_junit_artifacts
+        - .run_dependent
+    dependencies:
+        - t:windows-vs2022-x64-ninja
+    needs:
+        - t:windows-vs2022-x64-ninja
+    variables:
+        CMAKE_CI_BUILD_NAME: windows_intel2021.9.0_ninja
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
 t:windows-oneapi2023.1.0-ninja:
     extends:
         - .windows_inteloneapi_ninja

+ 1 - 0
.gitlab/ci/configure_windows_intelclassic_ninja.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_intelcompiler_common.cmake")

+ 9 - 0
.gitlab/ci/env_windows_intelclassic_ninja.ps1

@@ -0,0 +1,9 @@
+. .gitlab/ci/ninja-env.ps1
+. .gitlab/ci/intel-env.ps1
+
+$env:CC  = "icl"
+$env:CXX = "icl"
+$env:FC  = "ifort"
+
+cmd /c "icl 2>&1" | Select -First 1
+cmd /c "ifort 2>&1" | Select -First 1

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

@@ -1,6 +1,6 @@
 $erroractionpreference = "stop"
 
-if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)oneapi2023\.1\.0(_|$)") {
+if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2023\.1\.0|intel2021\.9\.0)(_|$)") {
     # Intel oneAPI 2023.1.0
     $version = "2023.1.0"
     $filename = "intel-oneapi-$version-windows-1"

+ 8 - 0
.gitlab/os-windows.yml

@@ -222,6 +222,14 @@
     variables:
         CMAKE_CONFIGURATION: windows_msvc_v71_nmake
 
+.windows_intelclassic_ninja:
+    extends:
+        - .windows_ninja
+        - .windows_vcvarsall_vs2022_x64
+
+    variables:
+        CMAKE_CONFIGURATION: windows_intelclassic_ninja
+
 .windows_inteloneapi_ninja:
     extends:
         - .windows_ninja