Skip to content

Commit dd2153f

Browse files
authored
Merge pull request #80 from Goddard-Fortran-Ecosystem/feature/mathomp4/update-ci-gftl-shared
CI: Make consistent with pFUnit CI
2 parents b6e2ed8 + aec3e95 commit dd2153f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
18-
compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
19-
exclude:
20-
- os: macos-13
21-
compiler: gfortran-10
22-
- os: macos-14
18+
compiler: [gfortran-11, gfortran-12, gfortran-13]
19+
# gfortran-10 is only on ubuntu-22.04
20+
# gfortran-14 is available on ubuntu-24.04
21+
include:
22+
- os: ubuntu-22.04
2323
compiler: gfortran-10
2424
- os: ubuntu-24.04
25-
compiler: gfortran-10
25+
compiler: gfortran-14
26+
exclude:
2627
- os: ubuntu-24.04
2728
compiler: gfortran-11
2829
- os: ubuntu-22.04

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
- Added gftl-shared-v2-as-default to install list
1111
- Added `-quiet` flag for NAG Fortran
1212
- Remove `macos-11` and `macos-12` from GitHub Actions, move to use `macos-13` and `macos-14`
13-
- Add Ubuntu 24 to CI that has `gfortran-13`. Remove `gfortran-13` test from ubuntu 22
13+
- Add Ubuntu 24 to CI that has `gfortran-13`. Remove `gfortran-13` test from ubuntu 22, add `gfortran-14`
1414
- Up `cmake_minimum_required`
1515

1616
## [1.8.0] - 2024-03-03

0 commit comments

Comments
 (0)