diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-01 18:02:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-01 19:51:32 (GMT) |
| commit | 195339e7ac605faad3cbd577a5c2a55672131d20 (patch) | |
| tree | 08eba6c4732e9c5601dd2c45069733270e3d5fa5 | |
| parent | 1b44973343d8a61ee30cfe9dc94b3b3c838689c6 (diff) | |
| download | CMake-195339e7ac605faad3cbd577a5c2a55672131d20.zip CMake-195339e7ac605faad3cbd577a5c2a55672131d20.tar.gz CMake-195339e7ac605faad3cbd577a5c2a55672131d20.tar.bz2 | |
gitlab-ci: Add job testing Intel 2021.9.0 compilers on Windows
| -rw-r--r-- | .gitlab-ci.yml | 15 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_intelclassic_ninja.cmake | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_intelclassic_ninja.ps1 | 9 | ||||
| -rwxr-xr-x | .gitlab/ci/intel.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 8 |
5 files changed, 34 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2abf09..6a41406 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.gitlab/ci/configure_windows_intelclassic_ninja.cmake b/.gitlab/ci/configure_windows_intelclassic_ninja.cmake new file mode 100644 index 0000000..c2d708b --- /dev/null +++ b/.gitlab/ci/configure_windows_intelclassic_ninja.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_intelcompiler_common.cmake") diff --git a/.gitlab/ci/env_windows_intelclassic_ninja.ps1 b/.gitlab/ci/env_windows_intelclassic_ninja.ps1 new file mode 100755 index 0000000..99f83b9 --- /dev/null +++ b/.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 diff --git a/.gitlab/ci/intel.ps1 b/.gitlab/ci/intel.ps1 index 5051633..2262669 100755 --- a/.gitlab/ci/intel.ps1 +++ b/.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" diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 62542cc..07a479e 100644 --- a/.gitlab/os-windows.yml +++ b/.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 |