From 412be35262b1984bc18a8ba8534b5753bf34f3e2 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Tue, 24 Feb 2026 13:37:07 -0800
Subject: [PATCH 1/3] CI: Add flang-22

---
 .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 c344b98..5756a88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,10 +56,13 @@ jobs:
             container: snowstep/llvm:jammy
 
           # https://hub.docker.com/r/phhargrove/llvm-flang/tags
+          - os: ubuntu-24.04
+            compiler: flang
+            version: 22
+            container: phhargrove/llvm-flang:22.1.0-latest
           - os: ubuntu-24.04
             compiler: flang
             version: 21
-            network: smp
             container: phhargrove/llvm-flang:21.1.0-latest
           - os: ubuntu-24.04
             compiler: flang

From 80879e0bad9246382c353228cf891f7aadac3159 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Tue, 24 Feb 2026 13:45:50 -0800
Subject: [PATCH 2/3] Workaround fpm 0.13.0 breakage of LFortran --profile
 release

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5756a88..233cdb4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -220,6 +220,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" ; \

From 8cfb9a7707463883d830b8e0e1076ec8926f1599 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Tue, 24 Feb 2026 14:44:13 -0800
Subject: [PATCH 3/3] assert_m: silence some harmless style warnings from
 LFortran

---
 src/assert_m.F90 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assert_m.F90 b/src/assert_m.F90
index 5147318..05f2097 100644
--- a/src/assert_m.F90
+++ b/src/assert_m.F90
@@ -117,8 +117,8 @@ pure subroutine assert_always(assertion, description, file, line)
             end block
           else
             location = location // '<unknown>'
-          endif
-        endif
+          end if
+        end if
 
 #if ASSERT_MULTI_IMAGE
 #  if ASSERT_PARALLEL_CALLBACKS
@@ -126,7 +126,7 @@ pure subroutine assert_always(assertion, description, file, line)
           me = assert_this_image()
         else
           me = 0
-        endif
+        end if
 #  else
         me = this_image()
 #  endif
@@ -145,7 +145,7 @@ pure subroutine assert_always(assertion, description, file, line)
           call assert_error_stop(message)
         else
           ; ! deliberate fall-thru
-        endif
+        end if
 #endif
 #ifdef __LFORTRAN__
         ! workaround a defect observed in LFortran 0.54: