Another test to see if force-setting the intel environment for the build and test changes anything at all

Author: danieljvickers

.github/workflows/test.yml

@@ -72,24 +72,30 @@ jobs:
           sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
           sudo apt-get update
           sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-mpi intel-oneapi-mpi-devel
-          DEFAULT_ENV=$(mktemp)
-          INTEL_ENV=$(mktemp)
-          printenv | sort > "$DEFAULT_ENV"
           source /opt/intel/oneapi/setvars.sh
-          printenv | sort > "$INTEL_ENV"
-          comm -13 "$DEFAULT_ENV" "$INTEL_ENV" >> $GITHUB_ENV
+          printenv >> $GITHUB_ENV
 
       - name: Build
         run:  |
           /bin/bash mfc.sh test --dry-run -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} --${{ matrix.precision }} 
 
       - name: Test
+        if:   matrix.os == 'macos' || (matrix.os == 'ubuntu' && matrix.intel == false)
         run:  |
           /bin/bash mfc.sh test --max-attempts 3 -j $(nproc) $OPT1 $OPT2
         env:
           OPT1: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
           OPT2: ${{ matrix.debug == 'debug' && '-% 20' || '' }}
 
+        name: Test (Intel)
+        if:   matrix.os == 'ubuntu' && matrix.intel == true
+        run:  |
+          source /opt/intel/oneapi/setvars.sh --force
+          /bin/bash mfc.sh test --max-attempts 3 -j $(nproc) $OPT1 $OPT2
+        env:
+          OPT1: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
+          OPT2: ${{ matrix.debug == 'debug' && '-% 20' || '' }}
+
   self:
     name: Self Hosted
     if: github.repository == 'MFlowCode/MFC' && needs.file-changes.outputs.checkall == 'true'