Skip to content

Commit 3a8f90c

Browse files
authored
Merge pull request #263 from bonachea/ci-macos-15-intel
2 parents cfb763b + 7878b40 commit 3a8f90c

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [macos-13, macos-14, macos-15, ubuntu-24.04]
16+
os: [macos-13, macos-14, macos-15, macos-15-intel, ubuntu-24.04]
1717
compiler: [ gfortran ]
1818
version: [ 13, 14 ]
1919
network: [ smp ]
@@ -24,15 +24,15 @@ jobs:
2424
network: smp
2525
include:
2626
# --- flang coverage ---
27-
- os: macos-13
27+
- os: macos-14
2828
compiler: flang
2929
version: 21
3030
network: smp
31-
- os: macos-14
31+
- os: macos-15
3232
compiler: flang
3333
version: 21
3434
network: smp
35-
- os: macos-15
35+
- os: macos-15-intel
3636
compiler: flang
3737
version: 21
3838
network: smp
@@ -77,6 +77,10 @@ jobs:
7777
compiler: gfortran
7878
version: 14
7979
network: udp
80+
- os: macos-15-intel
81+
compiler: flang
82+
version: 21
83+
network: udp
8084
- os: macos-15
8185
compiler: flang
8286
version: 21
@@ -176,14 +180,14 @@ jobs:
176180
177181
- name: Setup FPM
178182
uses: fortran-lang/setup-fpm@main
179-
if: ${{ !contains(matrix.os, 'macos') || matrix.os == 'macos-13' }}
183+
if: ${{ !contains(matrix.os, 'macos') || matrix.os == 'macos-13' || matrix.os == 'macos-15-intel'}}
180184
with:
181185
github-token: ${{ secrets.GITHUB_TOKEN }}
182186
fpm-version: latest
183187

184188
- name: Build FPM
185189
# no macos-arm64 fpm distro, build from source
186-
if: ${{ contains(matrix.os, 'macos') && matrix.os != 'macos-13' }}
190+
if: ${{ contains(matrix.os, 'macos') && matrix.os != 'macos-13' && matrix.os != 'macos-15-intel' }}
187191
run: |
188192
set -x
189193
export FPM_VERSION=0.12.0

0 commit comments

Comments
 (0)