Merge pull request #134 from Goddard-Fortran-Ecosystem/feature/mathom…

…p4/macos-14-ci Update CI to remove macos-12, add macos-14 and ubuntu-24
Goddard-Fortran-Ecosystem · Jul 9, 2024 · 3cf5969 · 3cf5969
2 parents 832569f + 234cfb7
commit 3cf5969
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,13 +15,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-11, macos-12]
-        compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-13, 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-14
         exclude:
-          - os: macos-11
+          - os: ubuntu-24.04
+            compiler: gfortran-11
+          - os: ubuntu-22.04
             compiler: gfortran-13
-          - os: macos-12
-            compiler: gfortran-10
 
       # 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
@@ -65,12 +72,12 @@ jobs:
           mkdir -p build
           cd build
           cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
-          make -j$(nproc)
+          make -j4
 
       - name: Build Tests
         run: |
           cd build
-          make -j$(nproc) tests
+          make -j4 tests
 
       - name: Run Tests
         run: |
@@ -141,12 +148,12 @@ jobs:
           mkdir -p build
           cd build
           cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
-          make -j$(nproc)
+          make -j4
 
       - name: Build Tests
         run: |
           cd build
-          make -j$(nproc) tests
+          make -j4 tests
 
       - name: Run Tests
         run: |
@@ -197,12 +204,12 @@ jobs:
           mkdir -p build
           cd build
           cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/pFlogger -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
-          make -j$(nproc)
+          make -j4
 
       - name: Build Tests
         run: |
           cd build
-          make -j$(nproc) tests
+          make -j4 tests
 
       - name: Run Tests
         run: |

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04`
+
 ## [1.15.0] - 2024-05-17
 
 ### Changed

diff --git a/tools/ci-install-gfe.bash b/tools/ci-install-gfe.bash
@@ -17,6 +17,6 @@ do
    cd ${GFE_DIR}/${repo}
    mkdir build && cd build
    cmake .. -DCMAKE_INSTALL_PREFIX=${GFE_INSTALL_DIR} -DCMAKE_PREFIX_PATH=${GFE_INSTALL_DIR}
-   make -j$(nproc) install
+   make -j4 install
 done