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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 12 commits into from
Jun 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e10f3bc
ci(tests): separate intel/arm mac integration test jobs
wpbonelli Jun 18, 2024
c51df6a
separate intel/arm mac release jobs
wpbonelli Jun 18, 2024
a8db827
use xcode clt 14.3.1 on mac
wpbonelli Jun 19, 2024
42dc825
hide dylibs
wpbonelli Jun 19, 2024
0e94b76
build mf6 with optimization=1 for arm mac
wpbonelli Jun 19, 2024
359f527
otool after build
wpbonelli Jun 19, 2024
bb64db7
hide libstdc++.6.dylib too
wpbonelli Jun 19, 2024
a2f5598
fix (define ostag)
wpbonelli Jun 19, 2024
6155014
just invoke pymake directly
wpbonelli Jun 20, 2024
31962de
fix timeout
wpbonelli Jun 20, 2024
e5b3405
fix artifact upload
wpbonelli Jun 20, 2024
dfea448
fix release step
wpbonelli Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
otool after build
  • Loading branch information
@wpbonelli
wpbonelli committed Jun 19, 2024
commit 359f5279a51cfce97b32b88fb5288d0bc57254dd
4 changes: 4 additions & 0 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ jobs:
sudo chmod +x modflow6/bin/*
sudo chmod +x modflow6/bin/downloaded/*
fi

- name: Check linked libs (macOS)
if: matrix.os == 'macos-14'
run: find $ostag -perm +111 -type f | xargs -I{} sh -c "otool -L {}"

- name: Upload programs
uses: actions/upload-artifact@v3
Expand Down
26 changes: 21 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
compiler: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 'gcc' || 'intel-classic' }}
version: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || 2021.7 }}

- name: Set LDFLAGS (macOS)
- name: Set LDFLAGS (ARM mac)
if: matrix.os == 'macos-14'
run: |
os_ver=$(sw_vers -productVersion | cut -d'.' -f1)
Expand All @@ -40,15 +40,16 @@ jobs:
echo "LDFLAGS=$ldflags" >> $GITHUB_ENV
fi

- name: Hide dylibs (macOS)
- name: Hide dylibs (ARM mac)
if: matrix.os == 'macos-14'
run: |
version="12"
libpath="/opt/homebrew/opt/gcc@$version/lib/gcc/$version"
mv $libpath/libgfortran.5.dylib $libpath/libgfortran.5.dylib.bak
mv $libpath/libquadmath.0.dylib $libpath/libquadmath.0.dylib.bak

- uses: maxim-lobanov/setup-xcode@v1
- name: Setup Xcode CLT (mac)
uses: maxim-lobanov/setup-xcode@v1
if: runner.os == 'macOS'
with:
xcode-version: "14.3.1"
Expand All @@ -75,13 +76,28 @@ jobs:
pip install -r requirements.txt
pip list

- name: Get OS tag
id: ostag
run: |
ostag=$(python -c "from modflow_devtools.ostags import get_ostag; print(get_ostag())")
echo "ostag=$ostag" >> $GITHUB_OUTPUT

- name: Build programs
run: python scripts/build_programs.py
run: |
ostag="${{ steps.ostag.outputs.ostag }}"
mkdir $ostag
python scripts/build_programs.py -p $ostag

- name: Build MF6 with optimization=1
- name: Build MF6 with -O1 (ARM mac)
if: matrix.os == 'macos-14'
run: make-program mf6 --zip macarm.zip --fflags='-O1'

- name: Check linked libs (ARM mac)
if: matrix.os == 'macos-14'
run: |
ostag="${{ steps.ostag.outputs.ostag }}"
find $ostag -perm +111 -type f | xargs -I{} sh -c "otool -L {}"

- name: Upload distribution archive
uses: actions/upload-artifact@v3
with:
Expand Down
Loading