|
57 | 57 | version=${{ env.GCC_V }} |
58 | 58 | brew_prefix="$(brew --prefix)" |
59 | 59 | 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 |
62 | 63 | mv $libpath/libquadmath.0.dylib $libpath/libquadmath.0.dylib.bak |
63 | 64 | mv $libpath/libstdc++.6.dylib $libpath/libstdc++.6.dylib.bak |
64 | 65 |
|
@@ -108,7 +109,7 @@ jobs: |
108 | 109 | ostag="${{ steps.ostag.outputs.ostag }}" |
109 | 110 | fetched=$(pixi run --manifest-path modflow6/pixi.toml python scripts/fetch_releases.py --manifest releases.json --list) |
110 | 111 | 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 |
112 | 113 | pixi run --manifest-path modflow6/pixi.toml make-code-json --appdir $ostag --zip $ostag.zip --verbose |
113 | 114 |
|
114 | 115 | - name: Show programs |
@@ -193,10 +194,9 @@ jobs: |
193 | 194 | shell: python |
194 | 195 | run: | |
195 | 196 | import os |
196 | | - next_version = os.getenv('NEXT_VERSION') |
197 | 197 | line = "The programs, version numbers, and the date " |
198 | 198 | 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" |
200 | 200 | with open('Header.md', "w") as file: |
201 | 201 | file.write(line) |
202 | 202 |
|
|
0 commit comments