2341 - Fix mac/intel runner (#2352)

* Try macos-13 GHA runner
* Attempting to use older SDK and target no longer works on macos-13 runner.

Author: akenmorris

.github/workflows/build-mac.yml

@@ -24,25 +24,21 @@ concurrency:
 jobs:
   build:
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
 
+    - name: Setup Miniconda
+      uses: conda-incubator/[email protected]
+
     - name: OS Setup
       run: |
-        ls /usr/local
-        uname -m
-        echo $CONDA
+        echo CONDA=$CONDA
         sudo chown -R $UID $CONDA
         conda init zsh
         source ~/.zshrc
         brew install ccache pigz gnu-tar coreutils
 
-    - name: Acquire 10.15 SDK
-      run: |
-        curl -L -o $HOME/MacOSX10.15.sdk.tar.xz https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.15.sdk.tar.xz
-        cd $HOME && tar -xJf MacOSX10.15.sdk.tar.xz
-        
     - name: Checkout code
       uses: actions/checkout@v3
       with:
@@ -61,7 +57,7 @@ jobs:
 
     - name: cmake
       shell: bash -l {0}
-      run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_LIBTOOL=/usr/bin/libtool -DCMAKE_CXX_FLAGS=-g -DCMAKE_PREFIX_PATH=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython3_ROOT_DIR:FILEPATH=${CONDA_PREFIX} -DUSE_OPENMP=OFF -DBuild_Studio=ON -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DCMAKE_OSX_SYSROOT="$HOME/MacOSX10.15.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DBUILD_DOCUMENTATION=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
+      run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_LIBTOOL=/usr/bin/libtool -DCMAKE_CXX_FLAGS=-g -DCMAKE_PREFIX_PATH=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython3_ROOT_DIR:FILEPATH=${CONDA_PREFIX} -DUSE_OPENMP=OFF -DBuild_Studio=ON -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DBUILD_DOCUMENTATION=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
 
     - name: make
       shell: bash -l {0}

.github/workflows/gha_deps.sh

@@ -25,12 +25,6 @@ else
 
     NPROCS=4
 
-    # if intel mac and not arm64, using uname -m to detect arm64
-    if [[ "$PLATFORM" == "mac-intel" ]]; then
-        export SDKROOT=$HOME/MacOSX10.15.sdk # only needed for MacOS obviously
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-    fi
-
     if [[ "$PLATFORM" == "linux" ]]; then
         # GHA runner is running out of resources with 4 now on linux
 	NPROCS=2