From 6ee971c716ee1031912a832814223d5e15de53dd Mon Sep 17 00:00:00 2001
From: Willem Deconinck <willem.deconinck@ecmwf.int>
Date: Mon, 20 Nov 2023 10:34:14 +0100
Subject: [PATCH] Update intel-oneapi install script

---
 .github/tools/install-intel-oneapi.sh | 12 ++++++------
 .github/workflows/build.yml           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/tools/install-intel-oneapi.sh b/.github/tools/install-intel-oneapi.sh
index 78af1aec0..a5d757188 100755
--- a/.github/tools/install-intel-oneapi.sh
+++ b/.github/tools/install-intel-oneapi.sh
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+version=2023.2.0
+KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 wget https://apt.repos.intel.com/intel-gpg-keys/$KEY
 sudo apt-key add $KEY
 rm $KEY
 echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
 sudo apt-get update
 sudo apt-get install \
-    intel-oneapi-compiler-fortran \
-    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
+    intel-oneapi-compiler-fortran-$version \
+    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-$version \
     intel-oneapi-mpi \
-    intel-oneapi-mpi-devel \
-    intel-oneapi-mkl
+    intel-oneapi-mkl-$version
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88a4493a5..408c37f51 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
         name:
           - linux gnu-10
           - linux clang-12
-          - linux intel
+          - linux intel-classic
           - macos
           # - linux nvhpc-21.9
 
@@ -75,9 +75,9 @@ jobs:
 #            cmake_options: -DCMAKE_CXX_FLAGS=--diag_suppress177
 #            caching: true
 
-          - name : linux intel
+          - name : linux intel-classic
             os: ubuntu-20.04
-            compiler: intel-oneapi
+            compiler: intel-classic
             compiler_cc: icc
             compiler_cxx: icpc
             compiler_fc: ifort
@@ -153,7 +153,7 @@ jobs:
         ${ECWAM_TOOLS}/install-intel-oneapi.sh
         source /opt/intel/oneapi/setvars.sh
         printenv >> $GITHUB_ENV
-        echo "CACHE_SUFFIX=$(icc -dumpversion)" >> $GITHUB_ENV
+        echo "CACHE_SUFFIX=$CC-$($CC -dumpversion)" >> $GITHUB_ENV
 
     - name: Install MPI
       shell: bash -eux {0}