Skip to content

Commit 705f0c4

Browse files
committed
CI: Initial gfortran-15 support
1 parent 915c2e3 commit 705f0c4

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
matrix:
1616
os: [macos-13, macos-14, macos-15, macos-15-intel, ubuntu-24.04]
1717
compiler: [ gfortran ]
18-
version: [ 13, 14 ]
18+
version: [ 13, 14, 15 ]
1919
network: [ smp ]
2020
exclude:
2121
- os: macos-15 # gcc-13 broken on macos-15
22-
compiler: gfortran
2322
version: 13
24-
network: smp
23+
- os: ubuntu-24.04 # no package available for gfortran 15 (yet?)
24+
version: 15
2525
include:
2626
# --- flang coverage ---
2727
- os: macos-14
@@ -124,6 +124,10 @@ jobs:
124124
echo "FC=gfortran-${COMPILER_VERSION}" >> "$GITHUB_ENV"
125125
echo "CC=gcc-${COMPILER_VERSION}" >> "$GITHUB_ENV"
126126
echo "CXX=g++-${COMPILER_VERSION}" >> "$GITHUB_ENV"
127+
# Veggies is incompatible with gfortran-15
128+
if test "${{ matrix.version }}" = "15"; then \
129+
echo "FPM_TEST_TARGET=--target julienne-driver" >> "$GITHUB_ENV" ; \
130+
fi
127131
128132
- name: Set flang variables
129133
if: matrix.compiler == 'flang'
@@ -237,7 +241,7 @@ jobs:
237241
echo SUBJOB_PREFIX=${SUBJOB_PREFIX}
238242
while (( CAF_IMAGES > 0 )); do \
239243
echo CAF_IMAGES=${CAF_IMAGES} ; \
240-
( set -x ; ./build/run-fpm.sh test --verbose -- -d ) ; \
244+
( set -x ; ./build/run-fpm.sh test $FPM_TEST_TARGET --verbose -- -d ) ; \
241245
sleep 1 ; \
242246
CAF_IMAGES=$(( CAF_IMAGES / 2 )) ; \
243247
done

0 commit comments

Comments
 (0)