Improve cmake workflow

jchristopherson · Feb 28, 2024 · de7eafa · de7eafa
1 parent 6822aaa
commit de7eafa
Showing 1 changed file with 28 additions and 29 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -10,40 +10,39 @@ env:
  BUILD_TYPE: Release
 
 jobs:
- build:
+ test:
  runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
- fortran_compiler: [gfortran, ifort]
- os: [ubuntu-latest, macos-latest] # issue with windows-latest & CMake with CMake not recognizing defined compilers
+ os: [ubuntu-latest, macos-latest]
+ toolchain:
+ - {compiler: gcc, version: 11}
+ - {compiler: intel-classic, version: '2021.9'}
+ include:
+ - os: ubuntu-latest
+ toolchain: {compiler: intel, version: '2023.2'}
 
  steps:
-
- - name: Setup IFORT
- if: contains( matrix.fortran_compiler, 'ifort' )
- uses: modflowpy/install-intelfortran-action@v1
-
- - name: Setup GFORTRAN
- if: contains( matrix.fortran_compiler, 'gfortran')
- uses: awvwgk/setup-fortran@main
- id: setup-fortran
- with:
- compiler: gcc
- version: 12
-
- env:
- FC: ${{ steps.setup-fortran.outputs.fc }}
- CC: ${{ steps.setup-fortran.outputs.cc }}
-
- - uses: actions/checkout@v3
-
- - name: Configure CMake
- run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=${{ env.CC }} -DCMAKE_Fortran_COMPILER=${{ env.FC }} -DBUILD_TESTING=TRUE -DBUILD_C_API=TRUE
+ - uses: awvwgk/setup-fortran@v1
+ id: setup-fortran
+ with:
+ compiler: ${{ matrix.toolchain.compiler }}
+ version: ${{ matrix.toolchain.version }}
+
+ - run: ${{ env.FC }} --version
+ env:
+ FC: ${{ steps.setup-fortran.outputs.fc }}
+ CC: ${{ steps.setup-fortran.outputs.cc }}
+
+ - uses: actions/checkout@v3
 
- - name: Build with CMake
- run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+ - name: Configure CMake
+ run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_Fortran_COMPILER=${{ env.FC }} -DBUILD_TESTING=TRUE
+
+ - name: Build with CMake
+ run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
- - name: Test with CMake
- working-directory: ${{github.workspace}}/build
- run: ctest -C ${{env.BUILD_TYPE}}
+  - name: Test with CMake
+  working-directory: ${{github.workspace}}/build
+  run: ctest -C ${{env.BUILD_TYPE}}