Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
separate builds for macos-13 Intel and macos-14 ARM
Browse files Browse the repository at this point in the history
jcschaff committed May 23, 2024
1 parent 0b4fc33 commit 1ee22f0
Showing 1 changed file with 34 additions and 9 deletions.
43 changes: 34 additions & 9 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, windows-latest, ubuntu-latest, macos-14-arm64]
platform: [macos-13, windows-latest, ubuntu-latest, macos-14]


runs-on: ${{ matrix.platform }}
@@ -53,8 +53,26 @@ jobs:
- name: checkout vcell-solvers repo
uses: actions/checkout@v4

- name: Install MacOS dependencies
if: matrix.platform == 'macos-latest'
- name: Install Intel MacOS dependencies
if: matrix.platform == 'macos-13'
shell: bash
run: |
brew install boost
brew install hdf5
brew install ninja
brew install llvm
echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
ln -s /usr/local/bin/gfortran-12 /usr/local/bin/gfortran
gcc --version
gfortran --version
cmake --version
brew info boost
brew info hdf5
- name: Install ARM MacOS dependencies
if: matrix.platform == 'macos-14'
shell: bash
run: |
brew install boost
@@ -72,7 +90,7 @@ jobs:
brew info hdf5
- name: Build Macos
if: matrix.platform == 'macos-latest'
if: matrix.platform == 'macos-13' || matrix.platform == 'macos-14'
run: |
platform=macos
echo "working dir is $PWD"
@@ -103,7 +121,7 @@ jobs:
ninja
- name: Test Macos
if: matrix.platform == 'macos-latest'
if: matrix.platform == 'macos-13' || matrix.platform == 'macos-14'
run: |
platform=macos
echo "working dir is $PWD"
@@ -285,7 +303,7 @@ jobs:
- name: fix Macos shared object paths
if: matrix.platform == 'macos-latest'
if: matrix.platform == 'macos-13' || matrix.platform == 'macos-14'
shell: bash
run: |
mkdir build/upload
@@ -328,12 +346,19 @@ jobs:
tar czvf ../upload/linux64.tgz --dereference .
cd ../..
- name: Upload Macos binaries
if: matrix.platform == 'macos-latest'
- name: Upload Intel Macos binaries
if: matrix.platform == 'macos-13'
uses: actions/upload-artifact@v4
with:
name: mac64.tgz
path: build/upload/macos_x86_64.tgz

- name: Upload ARM Macos binaries
if: matrix.platform == 'macos-14'
uses: actions/upload-artifact@v4
with:
name: mac64.tgz
path: build/upload/mac64.tgz
path: build/upload/macos_arm64.tgz

- name: Upload Windows binaries
if: matrix.platform == 'windows-latest'

0 comments on commit 1ee22f0

Please sign in to comment.