Skip to content

Commit 07c732b

Browse files
authored
ci(release): multiple fixes (#69)
* include double precision mfnwtdbl/mflgrdbl * no next version substitution in release description * only hide libgcc_s.1.1.dylib on arm mac
1 parent 8a22edb commit 07c732b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
version=${{ env.GCC_V }}
5858
brew_prefix="$(brew --prefix)"
5959
libpath="$brew_prefix/opt/gcc@$version/lib/gcc/$version"
60-
mv $libpath/libgcc_s.1.1.dylib $libpath/libgcc_s.1.1.dylib.bak
61-
mv $libpath/libgfortran.5.dylib $libpath/libgfortran.5.dylib.bak
60+
# libgcc_s.1.1 has no static counterpart on Intel; only hide it on ARM
61+
[[ "$(uname -m)" == "arm64" ]] && mv $libpath/libgcc_s.1.1.dylib $libpath/libgcc_s.1.1.dylib.bak
62+
mv $libpath/libgfortran.5.dylib $libpath/libgfortran.5.dylib.bak
6263
mv $libpath/libquadmath.0.dylib $libpath/libquadmath.0.dylib.bak
6364
mv $libpath/libstdc++.6.dylib $libpath/libstdc++.6.dylib.bak
6465
@@ -108,7 +109,7 @@ jobs:
108109
ostag="${{ steps.ostag.outputs.ostag }}"
109110
fetched=$(pixi run --manifest-path modflow6/pixi.toml python scripts/fetch_releases.py --manifest releases.json --list)
110111
pixi run --manifest-path modflow6/pixi.toml make-program : --appdir $ostag --exclude "$fetched" --keep --zip $ostag.zip --verbose
111-
pixi run --manifest-path modflow6/pixi.toml make-program mf2005,mfusg --appdir $ostag --double --keep --zip $ostag.zip --verbose
112+
pixi run --manifest-path modflow6/pixi.toml make-program mf2005,mfusg,mfnwt,mflgr --appdir $ostag --double --keep --zip $ostag.zip --verbose
112113
pixi run --manifest-path modflow6/pixi.toml make-code-json --appdir $ostag --zip $ostag.zip --verbose
113114
114115
- name: Show programs
@@ -193,10 +194,9 @@ jobs:
193194
shell: python
194195
run: |
195196
import os
196-
next_version = os.getenv('NEXT_VERSION')
197197
line = "The programs, version numbers, and the date "
198198
line += "stamp on the downloaded file used to create the "
199-
line += f"executables for version {next_version} are\n\n"
199+
line += f"executables are\n\n"
200200
with open('Header.md', "w") as file:
201201
file.write(line)
202202

0 commit comments

Comments
 (0)