update CI workflow

n-claes · Jan 2, 2023 · 2ace63f · 2ace63f
1 parent a3e6046
commit 2ace63f
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/.github/workflows/legolas.yml b/.github/workflows/legolas.yml
@@ -6,27 +6,25 @@ on:
   pull_request:
     branches: [master, develop]
 
-env:
-  CC: /usr/bin/gcc-10
-  FC: /usr/bin/gfortran-10
-  PFUNIT_DIR: /home/runner/work/legolas/legolas/tests/pFUnit/build/installed
-  LEGOLASDIR: /home/runner/work/legolas/legolas
-  ARPACK_ROOT: /home/runner/work/legolas/legolas/tests/arpack-ng
-
 jobs:
   test:
-    name: "${{ matrix.name }}"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - name: unit-tests
-            coverage: true
-          - name: regression
-            coverage: true
-
+        name: [unit-tests, regression]
+        os: [ubuntu-latest]
+        compiler: [gfortran-11]
+        coverage: [true]
+
+    env:
+      FC: ${{ matrix.compiler }}
+      PFUNIT_DIR: /home/runner/work/legolas/legolas/tests/pFUnit/build/installed
+      LEGOLASDIR: /home/runner/work/legolas/legolas
+      ARPACK_ROOT: /home/runner/work/legolas/legolas/tests/arpack-ng
+
+    name: ${{ matrix.name }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.9
@@ -39,16 +37,16 @@ jobs:
       with:
         cmake-version: "3.24.x"
 
-    - name: Install dependencies
+    - name: Install Legolas dependencies
       run: |
-        sudo apt update
+        sudo apt-get install ${{ matrix.compiler }}
         sudo apt-get install libblas-dev
         sudo apt-get install liblapack-dev
         sudo apt-get install lcov
-        gfortran-10 --version
+        ${FC} --version
         cmake --version
-        which gcov
-        which gcov-10
+        gcov --version
+
     - name: Install Python dependencies & Pylbo
       run: |
         python -m pip install --upgrade pip
@@ -128,7 +126,7 @@ jobs:
         cd coverage
         lcov --capture --directory $LEGOLASDIR/build \
             --output-file ${{ matrix.name }}.info \
-            --gcov-tool /usr/bin/gcov-10
+            --gcov-tool /usr/bin/gcov-11
         # filter out coverage files
         find $LEGOLASDIR/build -name '*.gc*' -delete