Skip to content

Commit 226a7fd

Browse files
committed
ci: handle GCC versions
1 parent b6d3053 commit 226a7fd

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,25 @@ jobs:
3636
- os: ubuntu-24.04
3737
shared: true
3838
gcc: 14
39-
# - os: macos-latest
40-
# shared: true
41-
# gcc: 13
42-
# - os: macos-latest
43-
# shared: false
44-
# gcc: 13
39+
- os: macos-latest
40+
shared: true
41+
gcc: 14
42+
- os: macos-latest
43+
shared: false
44+
gcc: 14
4545

4646
runs-on: ${{ matrix.os }}
47+
4748
env:
48-
CC: gcc-${{ matrix.gcc }}
4949
FC: gfortran-${{ matrix.gcc }}
5050

5151
steps:
5252
- uses: actions/checkout@v4
53+
54+
- name: GCC (Linux)
55+
if: runner.os == 'Linux'
56+
run: echo "CC=gcc-${{ matrix.gcc }}" >> $GITHUB_ENV
57+
5358
- uses: ./.github/workflows/composite-unix
5459

5560

.github/workflows/ci_build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ jobs:
2929
- os: macos-latest
3030
shared: false
3131

32-
env:
33-
FC: gfortran-13
34-
3532
runs-on: ${{ matrix.os}}
3633

3734
steps:
3835
- uses: actions/checkout@v4
3936

37+
- name: GCC 14 (macOS)
38+
if: runner.os == 'macOS'
39+
run: echo "FC=gfortran-14" >> $GITHUB_ENV
40+
4041
- name: Configure HDF5 library
4142
run: >-
4243
cmake

.github/workflows/ci_fpm.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,3 @@ jobs:
3030
- uses: actions/checkout@v4
3131

3232
- run: fpm build
33-
- run: fpm test

0 commit comments

Comments
 (0)