ci: add ifx 2023.2 and ifort 2021.8-10 to test matrix, only run autot…

…ests for ifx job

.github/workflows/ci.yml

@@ -308,8 +308,8 @@ jobs:
             pytest -v -n auto --durations 0 -m "not large"
           fi
 
-  test_ifort:
-    name: Test (ifort)
+  test_intel:
+    name: Test (Intel)
     needs:
       - lint
       - build
@@ -319,24 +319,61 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: ubuntu-22.04
+            intel_compiler: intel
+            intel_version: 2023.2
+          - os: ubuntu-22.04
+            intel_compiler: intel-classic
+            intel_version: 2021.10
+          - os: ubuntu-22.04
+            intel_compiler: intel-classic
+            intel_version: 2021.9
           - os: ubuntu-22.04
             intel_compiler: intel-classic
-            intel_version: 2021.7.0
+            intel_version: 2021.8
           - os: ubuntu-22.04
             intel_compiler: intel-classic
-            intel_version: 2021.6.0
+            intel_version: 2021.7
+          - os: ubuntu-22.04
+            intel_compiler: intel-classic
+            intel_version: 2021.6
+          # todo reinstate once awvwgk/setup-fortran supports ifx on macos
+          # - os: macos-12
+          #   intel_compiler: intel
+          #   intel_version: 2023.2
+          - os: macos-12
+            intel_compiler: intel-classic
+            intel_version: 2021.10
+          - os: macos-12
+            intel_compiler: intel-classic
+            intel_version: 2021.9
+          - os: macos-12
+            intel_compiler: intel-classic
+            intel_version: 2021.8
           - os: macos-12
             intel_compiler: intel-classic
-            intel_version: 2021.7.0
+            intel_version: 2021.7
           - os: macos-12
             intel_compiler: intel-classic
-            intel_version: 2021.6.0
+            intel_version: 2021.6
+          - os: windows-2022
+            intel_compiler: intel
+            intel_version: 2023.2
+          - os: windows-2022
+            intel_compiler: intel-classic
+            intel_version: 2021.10
+          - os: windows-2022
+            intel_compiler: intel-classic
+            intel_version: 2021.9
+          - os: windows-2022
+            intel_compiler: intel-classic
+            intel_version: 2021.8
           - os: windows-2022
             intel_compiler: intel-classic
-            intel_version: 2021.7.0
+            intel_version: 2021.7
           - os: windows-2022
             intel_compiler: intel-classic
-            intel_version: 2021.6.0
+            intel_version: 2021.6
 
     defaults:
       run:
@@ -385,19 +422,19 @@ jobs:
         run: meson test --verbose --no-rebuild -C builddir
 
       - name: Update flopy
-        if: matrix.intel_version == '2021.7.0'
+        if: matrix.intel_compiler == 'intel'
         working-directory: modflow6/autotest
         run: python update_flopy.py
 
       - name: Get executables
-        if: matrix.intel_version == '2021.7.0'
+        if: matrix.intel_compiler == 'intel'
         working-directory: modflow6/autotest
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: pytest -v --durations 0 get_exes.py
 
       - name: Test programs
-        if: matrix.intel_version == '2021.7.0'
+        if: matrix.intel_compiler == 'intel'
         working-directory: modflow6/autotest
         env:
           REPOS_PATH: ${{ github.workspace }}
@@ -409,7 +446,7 @@ jobs:
           fi
 
       - name: Test scripts
-        if: matrix.intel_version == '2021.7.0'
+        if: matrix.intel_compiler == 'intel'
         working-directory: modflow6/distribution
         env:
           GITHUB_TOKEN: ${{ github.token }}