ci: use installed stuff

geospace-code · Mar 26, 2020 · 46a6a1d · 46a6a1d
1 parent 206e290
commit 46a6a1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -27,6 +27,8 @@ jobs:
         sudo apt install -yq --no-install-recommends gfortran libhdf5-dev
 
     - run: ctest -S setup.cmake -V
+      env:
+        FC: gfortran-7
 
   meson:
     runs-on: ubuntu-latest
@@ -39,11 +41,11 @@ jobs:
     - run: pip install meson
     - run: |
         sudo apt update -yq
-        sudo apt install -yq --no-install-recommends ninja-build gfortran libhdf5-dev
+        sudo apt install -yq --no-install-recommends gfortran ninja-build libhdf5-dev
 
     - run: meson setup build
       env:
-        FC: gfortran
+        FC: gfortran-7
 
     - run: ninja -C build
 

diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - run: brew install pkg-config gcc hdf5 ninja
+    - run: brew install pkg-config hdf5 ninja
 
     - run: ctest -S setup.cmake -V
       env:
@@ -34,7 +34,7 @@ jobs:
         python-version: '3.x'
 
     - run: pip install meson
-    - run: brew install pkg-config gcc hdf5 ninja
+    - run: brew install pkg-config hdf5 ninja
 
     - run: meson setup build
       env: