From 197ad391831bc76ce04ce53dc05eb608537aa8ea Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sun, 12 Oct 2025 10:26:26 -0700
Subject: [PATCH 1/4] CI: setup-fpm now includes a fallback to build from
 source

---
 .github/workflows/build.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f033ad..002f773 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -189,14 +189,12 @@ jobs:
 
     - name: Setup FPM
       uses: fortran-lang/setup-fpm@main
-      if: ${{ !contains(matrix.os, 'macos') || matrix.os == 'macos-13' }}
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         fpm-version: latest
 
     - name: Build FPM
-      # no macos-arm64 fpm distro, build from source
-      if: ${{ contains(matrix.os, 'macos') && matrix.os != 'macos-13' }}
+      if: false
       run: |
         set -x
         curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v0.11.0/fpm-0.11.0.F90

From 8e31ab34169371329412651cc9779769ac10a71e Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sun, 12 Oct 2025 10:29:58 -0700
Subject: [PATCH 2/4] CI: Remove flang on macos-13

Homebrew no longer provides a binary bottle for llvm or flang on macos-13
---
 .github/workflows/build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 002f773..cc8d7d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,9 +29,6 @@ jobs:
 
           # --- LLVM flang coverage ---
 
-          - os: macos-13
-            compiler: flang
-            version: 21
           - os: macos-14
             compiler: flang
             version: 21

From 5f4d02b8db48c64645cd9d477f72b915bc4ab80f Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sun, 12 Oct 2025 10:31:51 -0700
Subject: [PATCH 3/4] CI: Add macos-15-intel runner

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc8d7d9..17457a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, macos-15, ubuntu-24.04]
+        os: [macos-13, macos-14, macos-15, macos-15-intel, ubuntu-24.04]
         compiler: [ gfortran ]
         version: [ 12, 13, 14, 15 ]
         extra_flags: [ -g ]
@@ -35,6 +35,9 @@ jobs:
           - os: macos-15
             compiler: flang
             version: 21
+          - os: macos-15-intel
+            compiler: flang
+            version: 21
 
           # https://hub.docker.com/r/snowstep/llvm/tags
           - os: ubuntu-24.04

From ea97fb925900880e551fc197d169a1ba70563e31 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sun, 12 Oct 2025 10:36:32 -0700
Subject: [PATCH 4/4] CI: factor and enhance version info

---
 .github/workflows/build.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17457a5..2a31894 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -205,12 +205,15 @@ jobs:
     - name: Version info
       run: |
         echo == TOOL VERSIONS ==
-        echo PATH="$PATH"
-        set -x
+        echo Platform version info:
         uname -a
-        if test -r /etc/os-release ; then cat /etc/os-release ; fi
-        ${FPM_FC} --version
-        fpm --version
+        if test -r /etc/os-release ; then grep -e NAME -e VERSION /etc/os-release  ; fi
+        if test -x /usr/bin/sw_vers ; then /usr/bin/sw_vers ; fi
+        echo
+        echo PATH="$PATH"
+        for tool in ${FPM_FC} fpm ; do
+          ( echo ; set -x ; w=$(which $tool) ; ls -al $w ; ls -alhL $w ; $tool --version )
+        done
 
     - name: Build and Test (Assertions OFF)
       run: |