Skip to content

Commit

Permalink
Updated to use the latest swig and llvm 15. (#1699)
Browse files Browse the repository at this point in the history
* Updated to use the latest swig and llvm 15.

* Updated to use the latest llvm that comes with the macos docker image.

* Added missing install

* Test without installing llvm

* Tested to link llvm

* Changed back to use downloaded llvm+clang package.

* Check if macos (13-arm) image can find the installed udunits.

* Try macos-13 if it works as documented

* Need to match the cpu type of macos and the build for clang+llvm.

* Change to Mac-12 for gtest.h to be found.

* Switch back to Mac-13 as gtest.h is not a factor for this CI process..
  • Loading branch information
hchen99 committed Apr 25, 2024
1 parent 873e4e2 commit e4f6774
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ on:

jobs:
macOS:
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Checkout repository
uses: actions/checkout@master

uses: actions/checkout@v3
- name: Install gtest
run: |
brew install googletest
Expand All @@ -26,21 +25,13 @@ jobs:
# sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.15.pkg -target /
brew install --cask xquartz
brew install udunits openmotif maven
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang+llvm-14.0.6-x86_64-apple-darwin.tar.xz
tar -xvf clang+llvm-14.0.6-x86_64-apple-darwin.tar.xz
brew install autoconf automake libtool
wget https://github.com/swig/swig/archive/refs/tags/v4.1.1.tar.gz
tar -xvzf v4.1.1.tar.gz
cd swig-4.1.1
./autogen.sh
./configure
make
make install
cd ..
brew install swig
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
tar -xvf clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
- name: Build Trick
run: |
export MAKEFLAGS=-j4
./configure --with-llvm=${GITHUB_WORKSPACE}/clang+llvm-14.0.6-x86_64-apple-darwin
./configure --with-llvm=${GITHUB_WORKSPACE}/clang+llvm-15.0.7-x86_64-apple-darwin21.0
make
- name: Test
run: |
Expand Down

0 comments on commit e4f6774

Please sign in to comment.