From 7a3cd0646f0ab347d0a257b09f7c534588c0a480 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Thu, 7 May 2026 11:25:11 -0700
Subject: [PATCH 1/2] CI: Tweak CI use of Linux brew

Ensure that Linux jobs where install.sh establishes Brew can find
that Brew in subsequent invocations of install.sh, rather than
re-installing Brew.
---
 .github/workflows/build.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5bc32697..be19cfd5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -413,6 +413,16 @@ jobs:
          ) ; \
         done
 
+    - name: Add Linux Brew to PATH
+      if: ${{ contains(matrix.os, 'ubuntu') && matrix.brew_via_install }}
+      run: |
+        set -x
+        # the first install.sh command established Linux Brew, so add it to the
+        # PATH to prevent pointless overwrites in the second install.sh below
+        HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew"
+        ( set +e ; ls -al ${HOMEBREW_PREFIX}/bin ; exit 0 )
+        echo "PATH=${HOMEBREW_PREFIX}/bin:${PATH}" >> "$GITHUB_ENV"
+
     - name: Build and Test Caffeine (thread-safe)
       run: |
         for var in FC CC CXX FFLAGS CPPFLAGS CFLAGS LDFLAGS LIBS GASNET_CONFIGURE_ARGS ; do \

From 0519dab9cf6f37de30c1d32d32cb86dc3cb66d51 Mon Sep 17 00:00:00 2001
From: Dan Bonachea <dobonachea@lbl.gov>
Date: Thu, 7 May 2026 12:06:24 -0700
Subject: [PATCH 2/2] CI: Add libflang_rt output code to Version info step

Disabled by default because it's too slow to justify the benefit for general use
---
 .github/workflows/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be19cfd5..08324cae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -345,6 +345,18 @@ jobs:
             ( echo ; set -x ; w=$(which $tool) ; ls -al $w ; ls -alhL $w ; $tool --version )
           fi
         done
+        if [[ ${{ matrix.compiler }} == flang ]] && false ; then
+          # Report any libflang_rt appearing in common places:
+          echo
+          if [ -n "${FC}" ] ; then
+            RDIR="$(${FC} -print-resource-dir)"
+          fi
+          if command -v brew ; then
+            BDIR="$(brew --prefix)"
+          fi
+          set -x
+          find $RDIR $BDIR /usr/lib/ -name '*flang_rt*' -exec ls -al {} \; | sort | uniq
+        fi
 
     - name: Build Caffeine (install.sh)
       run: |