From 8bdf384b09c97eab252829b5e4322885f6f4cafd Mon Sep 17 00:00:00 2001
From: Jack Atkinson <jwa34@cam.ac.uk>
Date: Thu, 15 Aug 2024 11:47:04 +0100
Subject: [PATCH] Update test-suite workflow to use the fortran-lang github
 action to access intel compilers.

---
 .github/workflows/test_suite.yml | 34 +++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml
index c00fcebc..67dd5949 100644
--- a/.github/workflows/test_suite.yml
+++ b/.github/workflows/test_suite.yml
@@ -17,11 +17,30 @@ jobs:
   # This workflow contains a single job called "test-suite"
   test-suite:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-      matrix:
-        std: ["f2008", "f2018"]
+    matrix:
+      os:
+        - ubuntu-latest
+        # - macos-latest
+        # - windows-latest
+      toolchain:
+        - {compiler: gcc, version: 13}
+        # - {compiler: intel, version: '2023.2'}
+        - {compiler: intel-classic, version: '2021.10'}
+        # - {compiler: nvidia-hpc, version: '23.11'}
+      include:
+        - os: ubuntu-latest
+          toolchain: {compiler: gcc, version: 12}
+      exclude:
+        - os: macos-latest
+          toolchain: {compiler: intel, version: '2023.2'}
+        # - os: macos-latest
+          # toolchain: {compiler: nvidia-hpc, version: '23.11'}
+        # - os: windows-latest
+          # toolchain: {compiler: nvidia-hpc, version: '23.11'}
+      std: ["f2008", "f2018"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -29,6 +48,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: setup-fortran
+        uses: fortran-lang/setup-fortran@v1
+        with:
+          compiler: ${{ matrix.toolchain.compiler }}
+          version: ${{ matrix.toolchain.version }}
+        run: |
+          ${{ env.FC }} ... # environment vars FC, CC, and CXX are set
+          ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too
+
       - name: Install Python
         uses: actions/setup-python@v5
         with: