Merge pull request #270 from bonachea/ci-fix-flang-latest

[NO REVIEW]: CI: fix flang-latest, add GFortran 15.2 coverage

Author: bonachea

.github/workflows/build.yml

@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, macos-15, macos-15-intel, ubuntu-24.04]
+        os: [ macos-13, macos-14, macos-15, macos-15-intel, macos-26, ubuntu-24.04 ]
         compiler: [ gfortran ]
-        version: [ 13, 14 ]
+        version: [ 13, 14, 15 ]
         network: [ smp ]
         exclude:
+          - os: macos-13 # macos-13 brew is currently Gfortran 15.1.0 which Veggies does not support
+            version: 15
           - os: macos-15 # gcc-13 broken on macos-15
-            compiler: gfortran
             version: 13
-            network: smp
         include:
         # --- flang coverage ---
           - os: macos-14
@@ -43,7 +43,7 @@ jobs:
             native_multi_image: 1
             FFLAGS: -fcoarray
             # https://hub.docker.com/r/snowstep/llvm/tags
-            container: snowstep/llvm:bookworm
+            container: snowstep/llvm:noble
           - os: ubuntu-24.04
             compiler: flang
             version: 21
@@ -73,6 +73,10 @@ jobs:
             compiler: gfortran
             version: 14
             network: udp
+          - os: ubuntu-24.04
+            compiler: gfortran
+            version: 15
+            network: udp
           - os: ubuntu-24.04
             compiler: gfortran
             version: 14
@@ -101,7 +105,7 @@ jobs:
             network: udp
             native_multi_image: 1
             FFLAGS: -fcoarray
-            container: snowstep/llvm:bookworm
+            container: snowstep/llvm:noble
 
     container:
       image: ${{ matrix.container }}
@@ -132,6 +136,9 @@ jobs:
         echo "FC=flang-new" >> "$GITHUB_ENV" 
         echo "CC=clang" >> "$GITHUB_ENV"
         echo "CXX=clang++" >> "$GITHUB_ENV"
+        if [[ "${{ matrix.container }}" =~ "snowstep/llvm" ]] ; then \
+          echo "LD_LIBRARY_PATH=/usr/lib/llvm-22/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" ; \
+        fi
 
     - name: Set Caffeine variables
       run: |
@@ -157,7 +164,25 @@ jobs:
       run: |
         set -x
         sudo apt update
-        sudo apt install -y build-essential gfortran-${COMPILER_VERSION} g++-${COMPILER_VERSION} pkg-config make
+        sudo apt install -y build-essential pkg-config make
+        if [[ ${COMPILER_VERSION} < 15 ]] ; then \
+          sudo apt install -y gfortran-${COMPILER_VERSION} g++-${COMPILER_VERSION} ; \
+        else \
+          curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh ; \
+          chmod +x install-homebrew.sh ; \
+          env CI=1 ./install-homebrew.sh ; \
+          HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew" ; \
+          ${HOMEBREW_PREFIX}/bin/brew install -v gcc@${COMPILER_VERSION} binutils ; \
+          ls -al ${HOMEBREW_PREFIX}/bin ; \
+          echo "PATH=${HOMEBREW_PREFIX}/bin:${PATH}" >> "$GITHUB_ENV" ; \
+          : Homebrew GCC@15 needs binutils 2.44+ ; \
+          HOMEBREW_BINUTILS=$(ls -d ${HOMEBREW_PREFIX}/Cellar/binutils/2.*/bin ) ; \
+          ls -al ${HOMEBREW_BINUTILS} ; \
+          echo "FFLAGS=${FFLAGS:+"$FFLAGS" }-B ${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" ; \
+          echo "CFLAGS=${CFLAGS:+"$CFLAGS" }-B ${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" ; \
+          echo "CXXFLAGS=${CXXFLAGS:+"$CXXFLAGS" }-B ${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" ; \
+          echo "LDFLAGS=${LDFLAGS:+"$LDFLAGS" }-B ${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" ; \
+        fi
 
     - name: Install Ubuntu Container Dependencies
       if: ${{ contains(matrix.os, 'ubuntu') && matrix.container != '' && !contains(matrix.container, 'phhargrove') }}

manifest/fpm.toml.template

@@ -7,7 +7,7 @@ copyright = "2021-2025 The Regents of the University of California, through Lawr
 
 [dev-dependencies]
 assert = {git = "https://github.com/berkeleylab/assert.git", tag = "3.0.0"}
-veggies = {git = "https://gitlab.com/everythingfunctional/veggies", tag = "v1.1.3"}
+veggies = {git = "https://gitlab.com/everythingfunctional/veggies", tag = "v1.2.1"}
 iso_varying_string = {git = "https://gitlab.com/everythingfunctional/iso_varying_string.git", tag = "v3.0.4"}
 
 [install]