Update ci.yml

individualize os+toolchain for flags setup
jalvesz · Mar 9, 2024 · 6f94cf7 · 6f94cf7
1 parent 1cf8c3e
commit 6f94cf7
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,22 +8,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        toolchain:
-          - {compiler: gcc, version: 13, flags: ['-O3 -march=native -mtune=native']}
-          - {compiler: intel, version: '2024.0.1', flags: ['-O3 -xhost']}
-          - {compiler: intel-classic, version: '2021.10', flags: ['-O3 -xhost']}
-          - {compiler: nvidia-hpc, version: '24.1', flags: ['-Ofast']}
         include:
           - os: ubuntu-latest
-            toolchain: {compiler: gcc, version: 12, flags: ['-O3 -march=native -mtune=native']}
-        exclude:
+            toolchain: {compiler: gcc, version: 12, flags: ['-cpp -O3 -march=native -mtune=native']}
+          - os: ubuntu-latest
+            toolchain: {compiler: gcc, version: 13, flags: ['-cpp -O3 -march=native -mtune=native']}
+          - os: ubuntu-latest
+            toolchain: {compiler: intel-classic, version: '2021.10', flags: ['-fpp -O3 -xhost']}
+          - os: ubuntu-latest
+            toolchain: {compiler: intel, version: '2024.0.1', flags: ['-fpp -O3 -xhost']}
+          - os: ubuntu-latest
+            toolchain: {compiler: nvidia-hpc, version: '24.1', flags: ['-Mpreprocess -Ofast']}
+          - os: windows-latest
+            toolchain: {compiler: gcc, version: 13, flags: ['-cpp -O3 -march=native -mtune=native']}
+          - os: windows-latest
+            toolchain: {compiler: intel-classic, version: '2021.10', flags: ['-fpp -O3 -QxHost']}
+          - os: windows-latest
+            toolchain: {compiler: intel, version: '2024.0.1', flags: ['-fpp -O3 -QxHost']}
           - os: macos-latest
-            toolchain: {compiler: intel, version: '2024.0.1'}
+            toolchain: {compiler: gcc, version: 13, flags: ['-cpp -O3 -march=native -mtune=native']}
           - os: macos-latest
-            toolchain: {compiler: nvidia-hpc, version: '24.1'}
-          - os: windows-latest
-            toolchain: {compiler: nvidia-hpc, version: '24.1'}
+            toolchain: {compiler: intel-classic, version: '2021.10', flags: ['-fpp -O3 -xhost']}
 
     steps:
       - name: Checkout code
@@ -48,6 +53,4 @@ jobs:
           ln -s /usr/local/lib/gcc/13/libquadmath.0.dylib /usr/local/lib/
 
       - run: |
-          fpm test --compiler ${{ env.FC }} --c-compiler ${{ env.CC }} --cxx-compiler ${{ env.CXX }} --flag "${{ join(matrix.toolchain.flags, ' ') }}"
-    #      ${{ env.FC }} ... # environment vars FC, CC, and CXX are set
-    #      ${{ steps.setup-fortran.outputs.fc }} ... # outputs work too
+          fpm test --flag "${{ join(matrix.toolchain.flags, ' ') }}"