From abc0df3ff7ce9330b632e9939be64b0697b9b59b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 8 Jul 2024 12:37:39 -0400 Subject: [PATCH] CI: Remove macos-11 and -12, add macos-13, -14; Add ubuntu 24, add gfortran-14 --- .github/workflows/main.yml | 13 +++++++------ ChangeLog.md | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9a893c..4324160 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,14 +16,15 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] - compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] - exclude: - - os: macos-13 - compiler: gfortran-10 - - os: macos-14 + compiler: [gfortran-11, gfortran-12, gfortran-13] + # gfortran-10 is only on ubuntu-22.04 + # gfortran-14 is available on ubuntu-24.04 + include: + - os: ubuntu-22.04 compiler: gfortran-10 - os: ubuntu-24.04 - compiler: gfortran-10 + compiler: gfortran-14 + exclude: - os: ubuntu-24.04 compiler: gfortran-11 - os: ubuntu-22.04 diff --git a/ChangeLog.md b/ChangeLog.md index 0146cfa..c202dd6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Added `-quiet` flag for NAG Fortran -- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04` +- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04`, add `gfortran-14` - Updated submodule for gFTL-shared (cbb09f4) ## [1.7.0] - 2024-03-04