mirror of
https://github.com/nasa/trick.git
synced 2024-12-24 07:16:41 +00:00
Updated to use the latest swig and llvm 15. (#1699)
* 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..
This commit is contained in:
parent
873e4e203d
commit
e4f6774b3c
21
.github/workflows/test_macos.yml
vendored
21
.github/workflows/test_macos.yml
vendored
@ -13,11 +13,10 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
macOS:
|
macOS:
|
||||||
runs-on: macos-latest
|
runs-on: macos-13
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Install gtest
|
- name: Install gtest
|
||||||
run: |
|
run: |
|
||||||
brew install googletest
|
brew install googletest
|
||||||
@ -26,21 +25,13 @@ jobs:
|
|||||||
# sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.15.pkg -target /
|
# sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.15.pkg -target /
|
||||||
brew install --cask xquartz
|
brew install --cask xquartz
|
||||||
brew install udunits openmotif maven
|
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
|
brew install swig
|
||||||
tar -xvf clang+llvm-14.0.6-x86_64-apple-darwin.tar.xz
|
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
|
||||||
brew install autoconf automake libtool
|
tar -xvf clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
|
||||||
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 ..
|
|
||||||
- name: Build Trick
|
- name: Build Trick
|
||||||
run: |
|
run: |
|
||||||
export MAKEFLAGS=-j4
|
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
|
make
|
||||||
- name: Test
|
- name: Test
|
||||||
run: |
|
run: |
|
||||||
|
Loading…
Reference in New Issue
Block a user