Skip to content

Commit e160c42

Browse files
authored
Merge branch 'fortran-lang:main' into release_0_11_0
2 parents 4537653 + 2a5c80d commit e160c42

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,22 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [ubuntu-latest, macos-12, windows-latest]
24+
os: [ubuntu-latest, macos-13, windows-latest]
2525
toolchain:
2626
- {compiler: gcc, version: 10}
2727
- {compiler: gcc, version: 11}
2828
- {compiler: gcc, version: 12}
2929
- {compiler: gcc, version: 13}
30+
- {compiler: gcc, version: 14}
3031
exclude:
31-
- os: macos-12
32-
toolchain: {compiler: gcc, version: 13}
32+
# Not yet supported by setup-fortran
33+
- os: windows-latest
34+
toolchain: {compiler: gcc, version: 14}
3335
include:
3436
- os: ubuntu-latest
3537
os-arch: linux-x86_64
3638
release-flags: --flag '--static -g -fbacktrace -O3'
37-
- os: macos-12
39+
- os: macos-13
3840
os-arch: macos-x86_64
3941
release-flags: --flag '-g -fbacktrace -O3'
4042
- os: windows-latest
@@ -59,7 +61,7 @@ jobs:
5961
with:
6062
fpm-version: 'v0.8.0'
6163

62-
# Backport gfortran shared libraries to version 9 folder. This is necessary because the macOS release of fpm
64+
# Backport gfortran shared libraries to version 10 folder. This is necessary because the macOS release of fpm
6365
# 0.10.0 used for bootstrapping has these paths hardcoded in the executable.
6466
- name: MacOS patch libgfortran
6567
if: contains(matrix.os, 'macos') && !contains(matrix.toolchain.version, '10')
@@ -190,7 +192,7 @@ jobs:
190192
strategy:
191193
fail-fast: false
192194
matrix:
193-
gcc_v: [10,11,12]
195+
gcc_v: [11,12,13]
194196

195197
steps:
196198
- uses: actions/checkout@v4

.github/workflows/meta.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
name: metapackage-tests
22

33
on:
4+
# On push, only run if any of the metapackage files has changed
45
push:
56
paths:
6-
- 'src/*meta*.f90' # On push, only launch job if something has changed in the metapackages
7+
- 'src/*meta*.f90'
78
- 'src/fpm/*meta*.f90'
89
- 'src/fpm/manifest/*meta*.f90'
910
- 'src/ci/meta_tests.sh'
1011
- 'src/.github/workflows/meta.yml'
12+
# Always run on PR or release
1113
pull_request:
1214
release:
1315
types: [published]
16+
# Allow manual triggering
17+
workflow_dispatch:
1418

1519
env:
1620
CI: "ON" # We can detect this in the build system and other vendors implement it
@@ -35,25 +39,20 @@ jobs:
3539
mpi: openmpi
3640
- os: ubuntu-latest
3741
mpi: mpich
38-
- os: macos-12
42+
- os: macos-13
3943
mpi: openmpi
40-
- os: macos-12
44+
- os: macos-13
4145
mpi: mpich
4246

4347

4448
steps:
4549
- name: Checkout code
4650
uses: actions/checkout@v4
4751

48-
- name: (Ubuntu) setup gcc version
49-
if: contains(matrix.os,'ubuntu')
50-
run: |
51-
echo "GCC_V=10" >> $GITHUB_ENV
52-
53-
- name: (macOS) setup gcc version
54-
if: contains(matrix.os,'macos')
55-
run: |
56-
echo "GCC_V=13" >> $GITHUB_ENV
52+
- name: (Ubuntu/macOS) setup gcc version
53+
if: contains(matrix.os,'ubuntu') || contains(matrix.os,'macos')
54+
run: |
55+
echo "GCC_V=14" >> $GITHUB_ENV
5756
5857
- name: (Windows) Install MSYS2
5958
uses: msys2/setup-msys2@v2

0 commit comments

Comments
 (0)