Skip to content

Commit

Permalink
still working on the macos build
Browse files Browse the repository at this point in the history
  • Loading branch information
casper-boon committed Feb 2, 2024
1 parent 61b29e8 commit 158af0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 38 deletions.
40 changes: 2 additions & 38 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,45 +135,9 @@ jobs:
git commit -m "Update Ubuntu 22.04 binaries"
git push
# macOS-BS:
# # The type of runner that the job will run on
# runs-on: macos-11
# env:
# GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

# # Steps represent a sequence of tasks that will be executed as part of the job
# steps:
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# - uses: actions/checkout@v4
#
# - name: Checkout submodules
# run: git submodule update --init --recursive

# - name: Install packages
# run: |
# brew reinstall gcc
# brew install netcdf

# - name: compile GLM
# run: |
# cd $GITHUB_WORKSPACE/glm-source
# ./build_glm.sh
# MOSDIR=`grep 'SOFTWARE LICENSE AGREEMENT FOR ' '/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf' | awk -F 'macOS ' '{print $NF}' | tr -d '\\' | tr ' ' '_'`
# mkdir -p $GITHUB_WORKSPACE/binaries/macos/${MOSDIR}
# cp -r $GITHUB_WORKSPACE/glm-source/binaries/macos/${MOSDIR}/* $GITHUB_WORKSPACE/binaries/macos/${MOSDIR}/.
#
# - name: update binaries and push to remote
# run: |
# git config --global user.name "github-actions[bot]"
# git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
# git pull
# git add -A
# git commit -m "Update MacOS binaries"
# git push

macOS-S:
macOS:
# The type of runner that the job will run on
runs-on: macos-14
runs-on: macos-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions glm-source/build_glm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ if [ "$OSTYPE" = "Darwin" ] ; then
export MACPORTS=true
fi
else
export CFLAGS="$CFLAGS -I/usr/local/include"
export HOMEBREW=true
fi
fi
Expand Down

0 comments on commit 158af0f

Please sign in to comment.