wip

wpbonelli · Feb 22, 2024 · a2f9525 · a2f9525
1 parent fa29361
commit a2f9525
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -63,9 +63,17 @@ jobs:
       matrix:
         include:
           - os: ${{ inputs.linux_version }}
+            compiler: ${{ inputs.compiler_toolchain }}
+            version: ${{ inputs.compiler_version }}
           - os: macos-12
+            compiler: ${{ inputs.compiler_toolchain }}
+            version: ${{ inputs.compiler_version }}
           - os: macos-14
+            compiler: gcc
+            version: 13
           - os: windows-2022
+            compiler: ${{ inputs.compiler_toolchain }}
+            version: ${{ inputs.compiler_version }}
     defaults:
       run:
         shell: bash -l {0}
@@ -90,11 +98,11 @@ jobs:
             bash
             powershell
 
-      - name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
+      - name: Setup ${{ matrix.compiler }} ${{ matrix.version }}
         uses: fortran-lang/setup-fortran@v1
         with:
-          compiler: ${{ inputs.compiler_toolchain }}
-          version: ${{ inputs.compiler_version }}
+          compiler: ${{ matrix.compiler }}
+          version: ${{ matrix.version }}
 
       - name: Set version number
         id: set_version
@@ -122,6 +130,15 @@ jobs:
           fi
           eval "$cmd"
 
+      # force static linking
+      # - name: Hide dylibs (macOS)
+      #   if: matrix.os == 'macos-14'
+      #   run: |
+      #     locate libgfortran
+      #     locate libquadmath
+      #     mv /opt/homebrew/opt/gcc/lib/gcc/current/libgfortran.5.dylib /opt/homebrew/opt/gcc/lib/gcc/current/libgfortran.5.dylib.bak
+      #     mv /opt/homebrew/opt/gcc/lib/gcc/current/libquadmath.0.dylib /opt/homebrew/opt/gcc/lib/gcc/current/libquadmath.0.dylib.bak
+
       - name: Build binaries
         if: runner.os != 'Windows'
         working-directory: modflow6
@@ -145,6 +162,11 @@ jobs:
           ostag=$(python -c "from modflow_devtools.ostags import get_ostag; print(get_ostag())")
           echo "ostag=$ostag" >> $GITHUB_OUTPUT
 
+      - name: Check architecture (macOS)
+        working-directory: modflow6/bin
+        if: runner.os == 'macOS'
+        run: lipo -info mf6
+
       - name: Upload binaries
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/release_dispatch.yml b/.github/workflows/release_dispatch.yml
@@ -119,7 +119,7 @@ jobs:
           echo "version=$ver" >> $GITHUB_OUTPUT
   make_dist:
     name: Make distribution
-    uses: MODFLOW-USGS/modflow6/.github/workflows/release.yml@develop
+    uses: wpbonelli/modflow6/.github/workflows/release.yml@release-ci
     needs: set_options
     with:
       # If the workflow is manually triggered, the maintainer must manually set approve=true to approve a release.