From e475640c8a1507bcfbc336d5fd1e7ef58eca63a0 Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Fri, 20 Nov 2026 15:38:13 -0800 Subject: [PATCH 1/4] CI: Use GITHUB_PATH for all PATH modifications Setting PATH in GITHUB_ENV is unreliable, because it gets overwritten by any use of GITHUB_PATH --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5583f08..d6e1f30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -284,7 +284,7 @@ jobs: retry ${HOMEBREW_PREFIX}/bin/brew install -v gcc@${COMPILER_VERSION} binutils \ 2>&1 | perl -pe "$BREW_WARNING_FILTER" ; test ${PIPESTATUS[0]} = 0 ls -al ${HOMEBREW_PREFIX}/bin - echo "PATH=${HOMEBREW_PREFIX}/bin:${PATH}" >> "$GITHUB_ENV" + echo "${HOMEBREW_PREFIX}/bin" >> "$GITHUB_PATH" : Homebrew GCC@15 needs binutils 2.44+ HOMEBREW_BINUTILS=$(ls -d ${HOMEBREW_PREFIX}/Cellar/binutils/2.*/bin ) ls -al ${HOMEBREW_BINUTILS} @@ -347,7 +347,7 @@ jobs: for p in /opt/homebrew /usr/local $(brew --prefix) ; do find $p/Cellar/flang -name ISO_Fortran_binding.h 2>/dev/null || true ; done echo "CFLAGS=-I$(dirname $(find $(brew --prefix)/Cellar/flang -name ISO_Fortran_binding.h | head -1)) ${CFLAGS}" >> "$GITHUB_ENV" # Prepend homebrew clang to PATH: - echo "PATH=$(brew --prefix)/opt/llvm/bin:${PATH}" >> "$GITHUB_ENV" + echo "$(brew --prefix)/opt/llvm/bin" >> "$GITHUB_PATH" - name: Setup Compilers run: | @@ -390,7 +390,7 @@ jobs: cd fpm-temp curl $CURL_OPTIONS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90 -o fpm.F90 $GFORTRAN -fopenmp -o bin/fpm fpm.F90 - echo "PATH=$PWD/bin:${PATH}" >> "$GITHUB_ENV" + echo "$PWD/bin" >> "$GITHUB_PATH" - name: Version info run: | From cd92dc9aee99789cd39f599aa570f09d981f8963 Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Fri, 20 Nov 2026 15:53:56 -0800 Subject: [PATCH 2/4] CI: Improve robustness of Linux gfortran install via brew The -B option is not documented as allowing a space, so don't use one --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6e1f30..f12f2ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -288,9 +288,10 @@ jobs: : Homebrew GCC@15 needs binutils 2.44+ HOMEBREW_BINUTILS=$(ls -d ${HOMEBREW_PREFIX}/Cellar/binutils/2.*/bin ) ls -al ${HOMEBREW_BINUTILS} - echo "FFLAGS=$FFLAGS -B${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" - echo "CFLAGS=$CFLAGS -B${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" - echo "CXXFLAGS=$CXXFLAGS -B${HOMEBREW_BINUTILS}" >> "$GITHUB_ENV" + 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 From f5167cb8d93683a0a303713acc11bc165c5ec55e Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Fri, 20 Nov 2026 18:36:35 -0800 Subject: [PATCH 3/4] CI: Adjust FPM logic for FPM 0.14.0 Remove libgcc12 dependency, no longer needed by setup-fpm with 0.14+ Use Setup FPM by default Update Build FPM rule (disabled) --- .github/workflows/build.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f12f2ef..f6af3f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,10 +327,8 @@ jobs: # Brew update takes a VERY long time to do cleanup and we don't care #retry brew update \ # 2>&1 | perl -pe "$BREW_WARNING_FILTER" ; test ${PIPESTATUS[0]} = 0 - # fpm binary distribution for macOS requires gfortran shared libraries from gcc@12 - retry brew install gcc@12 \ - 2>&1 | perl -pe "$BREW_WARNING_FILTER" ; test ${PIPESTATUS[0]} = 0 - if [[ ${{ matrix.compiler }} == 'gfortran' && ${COMPILER_VERSION} -gt 15 ]] ; then + if [[ ${{ matrix.compiler }} == 'gfortran' && + ( ${COMPILER_VERSION} -lt 13 || ${COMPILER_VERSION} -gt 15 ) ]] ; then retry brew install gcc@${COMPILER_VERSION} \ 2>&1 | perl -pe "$BREW_WARNING_FILTER" ; test ${PIPESTATUS[0]} = 0 fi @@ -372,16 +370,16 @@ jobs: echo "ERROR_STOP_CODE=${ERROR_STOP_CODE}" >> "$GITHUB_ENV" - name: Setup FPM - if: ${{ !(runner.os == 'Linux' && runner.arch == 'ARM64') }} + if: true uses: fortran-lang/setup-fpm@main with: github-token: ${{ secrets.GITHUB_TOKEN }} fpm-version: latest - name: Build FPM - if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }} + if: false run: | - export FPM_VERSION=0.13.0 + export FPM_VERSION=0.14.0 for suff in -14 -15 -16 "" -13 -12 ; do GFORTRAN=gfortran$suff if type -P $GFORTRAN ; then break ; fi @@ -389,7 +387,12 @@ jobs: type -p "$GFORTRAN" mkdir -p fpm-temp/bin cd fpm-temp - curl $CURL_OPTIONS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90 -o fpm.F90 + if [[ $FPM_VERSION == 'current' ]] ; then + FPM_ASSET=current/fpm.F90 + else + FPM_ASSET=v$FPM_VERSION/fpm-$FPM_VERSION.F90 + fi + curl $CURL_OPTIONS https://github.com/fortran-lang/fpm/releases/download/$FPM_ASSET -o fpm.F90 $GFORTRAN -fopenmp -o bin/fpm fpm.F90 echo "$PWD/bin" >> "$GITHUB_PATH" From 569ef87b24093c48e9870d8333c10f8320f7b8f2 Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Fri, 20 Nov 2026 18:44:56 -0800 Subject: [PATCH 4/4] CI: Add LFortran 0.69 --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6af3f4..3cd7d68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,6 +225,11 @@ jobs: version: 0.68.0 container: ghcr.io/lfortran/lfortran:v0.68.0 + - os: ubuntu-22.04 + compiler: lfortran + version: 0.69.0 + container: ghcr.io/lfortran/lfortran:v0.69.0 + - os: ubuntu-22.04 compiler: lfortran version: latest