From 2518c7024aa6cb9bf0a63039958ec23e96256ac0 Mon Sep 17 00:00:00 2001
From: Jaroslav Fowkes <jaroslav.fowkes@stfc.ac.uk>
Date: Thu, 11 Apr 2024 10:01:05 +0100
Subject: [PATCH] Try using Alexis SIFDecode CI

---
 .github/workflows/ci.yml | 45 +++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9a905f..7618f03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,38 +3,37 @@ on:
   push:
     branches:
       - master
-      - main
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
   build:
-    name: CUTEst ${{ matrix.os }} ${{ matrix.compiler }}
+    name: CUTEst/${{ matrix.os }}/${{ matrix.compiler }}-v${{ matrix.version }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            compiler: gnu
-            compiler_version: 13
-            sifdecode_input: '1\n1\nn\n1'
+            compiler: gcc
+            version: '12'
+            sifdecode_input: '1\n1\nN1\nNyy'
             cutest_input: '1\n1\nn\n1\n2\n2\nn\nn\ny\nd\ny\n'
             arch: 'pc64.lnx.gfo'
           - os: macos-latest
-            compiler: gnu
-            compiler_version: 13
-            sifdecode_input: '2\nn\n4'
+            compiler: gcc
+            version: '12'
+            sifdecode_input: '2\nN1\nNyy'
             cutest_input: '2\nn\n4\n2\n2\nn\nn\ny\nd\ny\n'
             arch: 'mac64.osx.gfo'
           - os: ubuntu-latest
-            compiler: intel
-            compiler_version: 2024.1
-            sifdecode_input: '1\n1\nn\n2\nn\ny'
+            compiler: intel-classic
+            version: '2021.10'
+            sifdecode_input: '1\n1\nN2\nNyy'
             cutest_input: '1\n1\nn\n2\nn\ny\n2\n8\nn\nn\ny\nd\ny\n'
             arch: 'pc64.lnx.ifr'
           - os: macos-latest
             compiler: intel-classic
-            compiler_version: 2021.9
-            sifdecode_input: '2\nn\n2\nn\ny'
+            version: '2021.10'
+            sifdecode_input: '2\nN2\nNyy'
             cutest_input: '2\nn\n5\n2\n4\nn\nn\ny\nd\ny\n'
             arch: 'mac64.osx.ifr'
     runs-on: ${{ matrix.os }}
@@ -44,11 +43,8 @@ jobs:
       CUTEST: ${{ github.workspace }}
       MASTSIF: ${{ github.workspace }}/sif
     steps:
-      - name: Set up Homebrew
-        if: matrix.compiler == 'gnu'
-        uses: Homebrew/actions/setup-homebrew@master
-      - name: Check out
-        uses: actions/checkout@v3
+      - name: Checkout CUTEst
+        uses: actions/checkout@v4
       - name: Download ARCHDefs
         id: download-archdefs
         uses: robinraju/release-downloader@v1.5
@@ -73,18 +69,11 @@ jobs:
         run: |
           tar zxf SIFDecode-${{ steps.download-sifdecode.outputs.tag_name }}.tar.gz
           mv ralna-SIFDecode-* SIFDecode
-      - name: Install GNU C and Fortran compilers
-        if: matrix.compiler == 'gnu'
-        uses: fortran-lang/setup-fortran@main
-        with:
-          compiler: gcc
-          version: ${{matrix.compiler_version}}
-      - name: Install Intel OneAPI C and Fortran compilers
-        if: matrix.compiler == 'intel'
+      - name: Install compilers
         uses: fortran-lang/setup-fortran@main
         with:
-          compiler: intel
-          version: ${{matrix.compiler_version}}
+          compiler: ${{ matrix.compiler }}
+          version: ${{ matrix.version }}
       - name: Install SIFDecode
         run: |
           cd $SIFDECODE