Skip to content

Commit 3ed81d0

Browse files
committed
CI: Add macos-15
1 parent 5a65f5d commit 3ed81d0

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [macos-13, macos-14, ubuntu-22.04, ubuntu-24.04]
13+
os: [macos-13, macos-14, macos-15, ubuntu-22.04, ubuntu-24.04]
1414
compiler: [ gfortran ]
1515
version: [ 12, 13, 14 ]
1616
extra_flags: [ -ffree-line-length-0 ]
17+
18+
exclude:
19+
- os: ubuntu-22.04
20+
version: 13 # no package available
21+
- os: ubuntu-22.04
22+
version: 14 # no package available
23+
1724
include:
1825
# https://hub.docker.com/r/phhargrove/llvm-flang/tags
1926
- os: ubuntu-24.04
@@ -45,12 +52,6 @@ jobs:
4552
extra_flags: -g
4653
container: intel/fortran-essentials:2025.0.0-0-devel-ubuntu22.04
4754

48-
exclude:
49-
- os: ubuntu-22.04
50-
version: 13 # no package available
51-
- os: ubuntu-22.04
52-
version: 14 # no package available
53-
5455
container:
5556
image: ${{ matrix.container }}
5657

@@ -90,12 +91,14 @@ jobs:
9091
9192
- name: Setup FPM
9293
uses: fortran-lang/setup-fpm@main
93-
if: ${{ matrix.os != 'macos-14' }}
94+
if: ${{ !contains(matrix.os, 'macos') || matrix.os == 'macos-13' }}
9495
with:
9596
github-token: ${{ secrets.GITHUB_TOKEN }}
97+
fpm-version: latest
9698

9799
- name: Build FPM
98-
if: ${{ matrix.os == 'macos-14' }} # no arm64 fpm distro, build from source
100+
# no macos-arm64 fpm distro, build from source
101+
if: ${{ contains(matrix.os, 'macos') && matrix.os != 'macos-13' }}
99102
run: |
100103
set -x
101104
curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v0.11.0/fpm-0.11.0.F90

0 commit comments

Comments
 (0)