From e4f6774b3c220c2df3ccce652b95e2efb206b067 Mon Sep 17 00:00:00 2001
From: Hong Chen <hchen99@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:17:40 -0500
Subject: [PATCH] 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..
---
 .github/workflows/test_macos.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
index 7ac9d157..e07f4e45 100644
--- a/.github/workflows/test_macos.yml
+++ b/.github/workflows/test_macos.yml
@@ -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
@@ -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: |