update actions

FreeFem · Dec 8, 2023 · 8ae290c · 8ae290c
1 parent 6417093
commit 8ae290c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 26 deletions.
diff --git a/.github/workflows/job1.yml b/.github/workflows/job1.yml
@@ -10,9 +10,6 @@ jobs:
     name: Job1 - Ubuntu ${{ matrix.version }}
     runs-on: ubuntu-${{ matrix.version }}
 
-    env:
-      HOME: /home/runner
-
     steps:
       - uses: actions/checkout@main
 
@@ -44,18 +41,18 @@ jobs:
     env:
       CC: gcc
       CXX: g++
-      FC: gfortran12
-      F77: gfortran12 #TODO find a way to define gfortran only
+      FC: gfortran
+      F77: gfortran
 
     steps:
-      - name: Check
-        run: echo ${HOME}
-
       - uses: actions/checkout@main
 
       - name: Install
         run: brew install gcc m4 git flex bison
 
+      - name: Setup GNU Fortran
+        uses: modflowpy/install-gfortran-action@v1
+
       - name: Configure
         run: |
           tar xvf AutoGeneratedFile.tar.gz

diff --git a/.github/workflows/job2.yml b/.github/workflows/job2.yml
@@ -3,11 +3,12 @@ on: [push]
 
 jobs:
   linux:
-    name: Job2 - Linux
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [20.04, 22.04]
 
-    env:
-      HOME: /home/runner
+    name: Job1 - Ubuntu ${{ matrix.version }}
+    runs-on: ubuntu-${{ matrix.version }}
 
     steps:
       - uses: actions/checkout@main
@@ -33,22 +34,28 @@ jobs:
         run: make install
 
   macos:
-    name: Job2 - MacOS
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        version: [11, 12]
+
+    name: Job1 - MacOS ${{ matrix.version }}
+    runs-on: macos-${{ matrix.version }}
 
     env:
-      HOME: /home/runner
       CC: clang
       CXX: clang++
-      FC: gfortran12
-      F77: gfortran12 #TODO find a way to define gfortran only
+      FC: gfortran
+      F77: gfortran
 
     steps:
       - uses: actions/checkout@main
 
       - name: Install
         run: brew install gcc m4 git flex bison suitesparse hdf5
 
+      - name: Setup GNU Fortran
+        uses: modflowpy/install-gfortran-action@v1
+
       - name: Configure
         run: |
           tar xvf AutoGeneratedFile.tar.gz

diff --git a/.github/workflows/job3.yml b/.github/workflows/job3.yml
@@ -3,11 +3,12 @@ on: [push]
 
 jobs:
   linux:
-    name: Job3 - Linux
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [20.04, 22.04]
 
-    env:
-      HOME: /home/runner
+    name: Job1 - Ubuntu ${{ matrix.version }}
+    runs-on: ubuntu-${{ matrix.version }}
 
     steps:
       - uses: actions/checkout@main
@@ -35,22 +36,28 @@ jobs:
         run: make install
 
   macos:
-    name: Job3 - MacOS
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        version: [11, 12]
+
+    name: Job1 - MacOS ${{ matrix.version }}
+    runs-on: macos-${{ matrix.version }}
 
     env:
-      HOME: /home/runner
       CC: clang
       CXX: clang++
-      FC: gfortran12
-      F77: gfortran12 #TODO find a way to define gfortran only
+      FC: gfortran
+      F77: gfortran
 
     steps:
       - uses: actions/checkout@main
 
       - name: Install
         run: brew install gcc m4 git flex bison suitesparse hdf5 cmake wget autoconf automake
 
+      - name: Setup GNU Fortran
+        uses: modflowpy/install-gfortran-action@v1
+
       - name: Configure
         run: |
           autoreconf -i