From eb20d34aa4e56ee13295a3c1d5014be41fae916b Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sat, 28 Feb 2026 21:28:23 -0800
Subject: [PATCH 1/2] CI: Update for Homebrew upgrade to flang-22

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2bbfa8b6..4fdf191a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,16 +23,16 @@ jobs:
 
           - os: macos-14
             compiler: flang
-            version: 21
+            version: 22
           - os: macos-15
             compiler: flang
-            version: 21
+            version: 22
           - os: macos-15-intel
             compiler: flang
-            version: 21
+            version: 22
           - os: macos-26
             compiler: flang
-            version: 21
+            version: 22
 
           # https://hub.docker.com/r/snowstep/llvm/tags
           - os: ubuntu-24.04

From d6cdbe74b71d32dfba02578827a1ee11408be7b8 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Sat, 28 Feb 2026 21:35:40 -0800
Subject: [PATCH 2/2] CI: Add LFortran coverage

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fdf191a..f2f181d3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,6 +92,13 @@ jobs:
           #  version: 0.54.0
           #  container: phhargrove/lfortran:0.54.0-1
 
+          # https://github.com/lfortran/lfortran/pkgs/container/lfortran
+          - os: ubuntu-22.04
+            compiler: lfortran
+            version: latest
+            container: ghcr.io/lfortran/lfortran:latest
+            extra_flags: --separate-compilation --realloc-lhs-arrays
+
     container:
       image: ${{ matrix.container }}
 
@@ -136,6 +143,12 @@ jobs:
         set -x
         apt update
         apt install -y build-essential pkg-config make git curl
+        # Add container lfortran to PATH:
+        if test "$FC" = "lfortran"; then \
+          echo "/app/bin" >> "$GITHUB_PATH" ; \
+          ls -alh /app/bin ; \
+          ls -alh /app/share/lfortran/lib/ ; \
+        fi
 
     - name: Install macOS Dependencies
       if: contains(matrix.os, 'macos')
@@ -170,6 +183,7 @@ jobs:
         elif test "$FC" = "lfortran" ; then \
           echo "FPM_FC=lfortran" >> "$GITHUB_ENV" ; \
           echo "FFLAGS=--cpp $FFLAGS" >> "$GITHUB_ENV" ; \
+          echo "FPM_FLAGS=--profile debug --verbose" >> "$GITHUB_ENV" ; : fpm 0.13 workaround ; \
         else \
           echo "FPM_FC=gfortran-${COMPILER_VERSION}" >> "$GITHUB_ENV" ; \
           echo "FFLAGS=-ffree-line-length-0 $FFLAGS" >> "$GITHUB_ENV" ; \