From 8594c1f50864db4cc815422ba9e3327da65a3b9c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 May 2024 15:35:35 -0400 Subject: [PATCH 1/3] Move to Ubuntu 24 --- .github/workflows/main.yml | 2 +- ChangeLog.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 195eb2b..86f6139 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, macos-12, macos-13] + os: [ubuntu-24.04, macos-12, macos-13] compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] exclude: - os: macos-12 diff --git a/ChangeLog.md b/ChangeLog.md index 42acc11..b69f88a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `-quiet` flag for NAG Fortran - Remove `macos-11` from GitHub Actions, add `macos-12` +- Moved CI to use Ubuntu 24 as that has `gfortran-13` ## [1.8.0] - 2024-03-03 From 22f91a966c6b3e70ebd6ad169c9c2b6d1de10765 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 May 2024 15:39:11 -0400 Subject: [PATCH 2/3] Fix up CI --- .github/workflows/main.yml | 6 +++++- ChangeLog.md | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86f6139..35904c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,13 +14,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, macos-12, macos-13] + os: [ubuntu-22.04, ubuntu-24.04, macos-12, macos-13] compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] exclude: - os: macos-12 compiler: gfortran-10 - os: macos-13 compiler: gfortran-10 + - os: ubuntu-24.04 + compiler: gfortran-10 + - os: ubuntu-22.04 + compiler: gfortran-13 # fail-fast if set to 'true' here is good for production, but when # debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails diff --git a/ChangeLog.md b/ChangeLog.md index b69f88a..1db37be 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `-quiet` flag for NAG Fortran - Remove `macos-11` from GitHub Actions, add `macos-12` -- Moved CI to use Ubuntu 24 as that has `gfortran-13` +- Add Ubuntu 24 to CI that has `gfortran-13`. Remove `gfortran-13` test from ubuntu 22 ## [1.8.0] - 2024-03-03 From f6c8414ea4e826a8a682ae3362053b918e3f14e0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 May 2024 15:41:13 -0400 Subject: [PATCH 3/3] Fix up macos --- .github/workflows/main.yml | 8 +++++--- ChangeLog.md | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35904c2..29d04b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,15 +14,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, ubuntu-24.04, macos-12, macos-13] + os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13] exclude: - - os: macos-12 - compiler: gfortran-10 - os: macos-13 compiler: gfortran-10 + - os: macos-14 + compiler: gfortran-10 - os: ubuntu-24.04 compiler: gfortran-10 + - os: ubuntu-24.04 + compiler: gfortran-11 - os: ubuntu-22.04 compiler: gfortran-13 diff --git a/ChangeLog.md b/ChangeLog.md index 3260009..38b001b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added gftl-shared-v2-as-default to install list - Added `-quiet` flag for NAG Fortran -- Remove `macos-11` from GitHub Actions, add `macos-12` +- Remove `macos-11` and `macos-12` from GitHub Actions, move to use `macos-13` and `macos-14` - Add Ubuntu 24 to CI that has `gfortran-13`. Remove `gfortran-13` test from ubuntu 22 ## [1.8.0] - 2024-03-03