From 8e86cbd310948d8070c57ed9ad492b5ea980e825 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Wed, 13 May 2026 19:29:09 -0700 Subject: [PATCH 1/3] ci(release): include double prec mfnwt and mflgr --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a46074b..57c2df3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -108,7 +108,7 @@ jobs: ostag="${{ steps.ostag.outputs.ostag }}" fetched=$(pixi run --manifest-path modflow6/pixi.toml python scripts/fetch_releases.py --manifest releases.json --list) pixi run --manifest-path modflow6/pixi.toml make-program : --appdir $ostag --exclude "$fetched" --keep --zip $ostag.zip --verbose - pixi run --manifest-path modflow6/pixi.toml make-program mf2005,mfusg --appdir $ostag --double --keep --zip $ostag.zip --verbose + pixi run --manifest-path modflow6/pixi.toml make-program mf2005,mfusg,mfnwt,mflgr --appdir $ostag --double --keep --zip $ostag.zip --verbose pixi run --manifest-path modflow6/pixi.toml make-code-json --appdir $ostag --zip $ostag.zip --verbose - name: Show programs From f421543606317a0237ca8edd9eb698890a4ab176 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Wed, 13 May 2026 19:34:43 -0700 Subject: [PATCH 2/3] no next version substitution in release description --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57c2df3..53ea191 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -193,10 +193,9 @@ jobs: shell: python run: | import os - next_version = os.getenv('NEXT_VERSION') line = "The programs, version numbers, and the date " line += "stamp on the downloaded file used to create the " - line += f"executables for version {next_version} are\n\n" + line += f"executables are\n\n" with open('Header.md', "w") as file: file.write(line) From c226a4317cac9a9e3ac1b858c3842559cf72169a Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Wed, 13 May 2026 19:52:08 -0700 Subject: [PATCH 3/3] only hide libgcc_s.1.1.dylib on arm mac --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53ea191..81efb3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,8 +57,9 @@ jobs: version=${{ env.GCC_V }} brew_prefix="$(brew --prefix)" libpath="$brew_prefix/opt/gcc@$version/lib/gcc/$version" - mv $libpath/libgcc_s.1.1.dylib $libpath/libgcc_s.1.1.dylib.bak - mv $libpath/libgfortran.5.dylib $libpath/libgfortran.5.dylib.bak + # libgcc_s.1.1 has no static counterpart on Intel; only hide it on ARM + [[ "$(uname -m)" == "arm64" ]] && mv $libpath/libgcc_s.1.1.dylib $libpath/libgcc_s.1.1.dylib.bak + mv $libpath/libgfortran.5.dylib $libpath/libgfortran.5.dylib.bak mv $libpath/libquadmath.0.dylib $libpath/libquadmath.0.dylib.bak mv $libpath/libstdc++.6.dylib $libpath/libstdc++.6.dylib.bak