From 2595b78947343f967ffdae66f61ef3eeaf09c081 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sun, 2 Aug 2026 15:22:35 -0700
Subject: [PATCH] CI: Expand test coverage to include Linux-arm and
 ubuntu-26.04

---
 .github/workflows/build.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2407fee2..66f06400 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,6 +66,17 @@ jobs:
         network: [ smp ]
         include:
 
+        # --- Other selected GFortran+Linux combos ---
+          - os: ubuntu-26.04
+            compiler: gfortran
+            version: 16
+          - os: ubuntu-26.04-arm
+            compiler: gfortran
+            version: 16
+          - os: ubuntu-24.04-arm
+            compiler: gfortran
+            version: 16
+          
         # --- flang coverage ---
           - os: macos-14
             compiler: flang
@@ -89,6 +100,12 @@ jobs:
             brew_via_install: 1
             install_filter: 2>&1 | grep -v 'Sandbox unavailable'
 
+          - os: ubuntu-26.04-arm
+            label: Homebrew
+            compiler: flang
+            brew_via_install: 1
+            install_filter: 2>&1 | grep -v 'Sandbox unavailable'
+
           # https://hub.docker.com/r/snowstep/llvm/tags
           - os: ubuntu-24.04
             compiler: flang
@@ -264,7 +281,7 @@ jobs:
       run: |
         sudo apt update
         sudo apt install -y build-essential pkg-config make
-        if [[ ${COMPILER_VERSION} -lt 15 ]] ; then
+        if [[ ${COMPILER_VERSION} -lt 15 ]] || type -p gfortran-${COMPILER_VERSION} ; then
           sudo apt install -y gfortran-${COMPILER_VERSION} g++-${COMPILER_VERSION}
         else
           curl $CURL_OPTIONS https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh
@@ -308,16 +325,16 @@ jobs:
         echo "PATH=$(brew --prefix)/opt/llvm/bin:${PATH}" >> "$GITHUB_ENV"
 
     - name: Setup FPM
-      if: ${{ !matrix.brew_via_install }}
+      if: ${{ !matrix.brew_via_install && !(runner.os == 'Linux' && runner.arch == 'ARM64') }}
       uses: fortran-lang/setup-fpm@main
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         fpm-version: latest
 
     - name: Build FPM
-      if: false
+      if: ${{ !matrix.brew_via_install && runner.os == 'Linux' && runner.arch == 'ARM64' }}
       run: |
-        export FPM_VERSION=0.12.0
+        export FPM_VERSION=0.13.0
         curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90
         mkdir fpm-temp
         gfortran-14 -o fpm-temp/fpm fpm-$FPM_VERSION.F90