fix: set SETVARS_COMPLETED after installing/activating Intel toolchain, don't unset local variable in install_intel_apt bash function, test intel and intel-classic on ubuntu-20.04

Author: wpbonelli

.github/workflows/test.yml

@@ -38,6 +38,10 @@ jobs:
           - {compiler: gcc, version:  6}
           # {compiler: gcc, version:  5}
         include:
+          - {os: ubuntu-20.04, toolchain: {compiler: intel, version: '2023.2'}}
+          - {os: ubuntu-20.04, toolchain: {compiler: intel, version: '2022.2.1'}}
+          - {os: ubuntu-20.04, toolchain: {compiler: intel, version: '2021.4'}}
+
           - {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.2'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.1'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2023.0'}}
@@ -51,6 +55,10 @@ jobs:
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2021.1.2'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel, version: '2021.1'}}
 
+          - {os: ubuntu-20.04, toolchain: {compiler: intel-classic, version: '2021.10'}}
+          - {os: ubuntu-20.04, toolchain: {compiler: intel-classic, version: '2021.7.1'}}
+          - {os: ubuntu-20.04, toolchain: {compiler: intel-classic, version: '2021.4'}}
+
           - {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.10'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.9'}}
           # {os: ubuntu-22.04, toolchain: {compiler: intel-classic, version: '2021.8'}}

README.md

@@ -108,7 +108,7 @@ Supported Intel toolchains:
 | windows-\* | intel | 2023.2, 2023.1, 2023.0, 2022.2.0, 2022.1.0 |
 | windows-\* | intel-classic | 2021.10.0, 2021.9.0, 2021.8.0, 2021.7.0, 2021.6.0 |
 
-**Note:** on macOS the `intel`/`ifx` compiler option is not suppoted, only `intel-classic` with the `ifort` compiler.
+**Note:** on macOS the `intel`/`ifx` compiler option is not supported, only `intel-classic` with the `ifort` compiler.
 
 ## License
 

action.yml

@@ -135,6 +135,11 @@ runs:
           echo CC=$CC>>$GITHUB_ENV
         fi
 
+        # set flag to indicate that SETVARS has been run
+        if [[ "${{ inputs.compiler }}" =~ "intel" ]]; then
+          echo SETVARS_COMPLETED=1>>$GITHUB_ENV
+        fi
+
     # GitHub Actions prepends GNU linker to the PATH before all bash steps, hide it so MSVC linker is found
     - name: Hide GNU linker (Windows)
       if: runner.os == 'Windows' && contains(inputs.compiler, 'intel')

setup-fortran.sh

@@ -281,7 +281,6 @@ install_intel_apt()
   $fetch https://apt.repos.intel.com/intel-gpg-keys/$_KEY > $_KEY
   sudo apt-key add $_KEY
   rm $_KEY
-  unset $_KEY
   echo "deb https://apt.repos.intel.com/oneapi all main" \
     | sudo tee /etc/apt/sources.list.d/oneAPI.list
   sudo apt-get update