From e7045ce4377297b3c55801a8dfcaec17b98db90c Mon Sep 17 00:00:00 2001
From: ado <adnan.abd0124@gmail.com>
Date: Mon, 7 Aug 2023 01:33:50 +0200
Subject: [PATCH] Update ci workflows

---
 .github/workflows/ubuntu-latest-clang.yml | 9 ++++-----
 .github/workflows/ubuntu-latest-icc.yml   | 9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml
index 6615263..3056042 100644
--- a/.github/workflows/ubuntu-latest-clang.yml
+++ b/.github/workflows/ubuntu-latest-clang.yml
@@ -23,8 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        version:
-          ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
+        version: ['16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
         type: [Release, Debug]
 
     runs-on: ubuntu-latest
@@ -37,6 +36,8 @@ jobs:
       options: -v /usr/local:/host_usr_local
 
     env:
+      CC: clang-${{ matrix.version }}
+      CXX: clang++-${{ matrix.version }}
       CXXFLAGS: -stdlib=libc++
 
     steps:
@@ -55,9 +56,7 @@ jobs:
           script/ci_install_deps.sh
 
       - name: Configure
-        run: >-
-          cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build
-          -DCMAKE_BUILD_TYPE=${{matrix.type}}
+        run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}}
 
       - name: Build
         run: cmake --build build -j ${{steps.cores.outputs.count}}
diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml
index 553c1c2..5d4a0d2 100644
--- a/.github/workflows/ubuntu-latest-icc.yml
+++ b/.github/workflows/ubuntu-latest-icc.yml
@@ -17,8 +17,8 @@ on:
 
 env:
   URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431
-  LINUX_BASEKIT_URL: ${{URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh
-  LINUX_HPCKIT_URL: ${{URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh
+  LINUX_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh
+  LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh
 
 jobs:
   icc_tests:
@@ -46,13 +46,14 @@ jobs:
           path: |
             /opt/intel/oneapi/compiler
           key: >-
-            install-${{env.LINUX_HPCKIT_URL}}-
+            install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}-
             ${{env.LINUX_CPP_COMPONENTS_WEB}}-
             compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
 
       - name: Install icc
         run: >-
-          script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
+          script/ci_install_icc.sh ${URL_BASE}/${LINUX_HPCKIT_SCRIPT}
+          ${URL_BASE}/${LINUX_CPP_COMPONENTS_WEB}
 
       - name: CMake
         run: echo "/host_usr_local/bin" >> $GITHUB_PATH