Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(macos): add distribution for apple silicon #29

Merged
merged 12 commits into from
Jun 20, 2024
Next Next commit
ci(tests): separate intel/arm mac integration test jobs
  • Loading branch information
wpbonelli committed Jun 19, 2024
commit e10f3bcc42bc95bdac4c34b6034b74fd95689389
23 changes: 18 additions & 5 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, macos-latest, windows-2019 ]
os: [ ubuntu-22.04, macos-13, macos-14, windows-2019 ]
defaults:
run:
shell: bash -l {0}
Expand All @@ -33,17 +33,30 @@ jobs:
cache-downloads: true
init-shell: bash

- name: Setup Intel fortran
- name: Setup ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 'gcc' || 'intel-classic' }} ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || 2021.7 }}
uses: fortran-lang/setup-fortran@v1
with:
compiler: intel-classic
version: 2021.7
compiler: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 'gcc' || 'intel-classic' }}
version: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || 2021.7 }}

- name: Set LDFLAGS (macOS)
if: matrix.os == 'macos-14'
run: |
os_ver=$(sw_vers -productVersion | cut -d'.' -f1)
if (( "$os_ver" > 12 )); then
ldflags="$LDFLAGS -Wl,-ld_classic"
echo "LDFLAGS=$ldflags" >> $GITHUB_ENV
fi

# only necessary because we need mf5to6 for mf6 autotests
- name: Build modflow6
working-directory: modflow6
run: |
meson setup builddir --prefix=$(pwd) --libdir=bin -Ddebug=false
setupargs="--prefix=$(pwd) --libdir=bin -Ddebug=false"
if [[ "${{ matrix.os }}" == "macos-14" ]]; then
setupargs="-Doptimization=1"
fi
meson setup builddir $setupargs
meson install -C builddir

- name: Get OS tag
Expand Down