From ee1c18c36c5c7c97cf26d0327da01da4b103b3ae Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Tue, 24 Dec 2024 17:22:40 -0500
Subject: [PATCH] Cleanup

- cleanup the scripts a little to get rid of some stuff from debugging
  the process
- drop MacOS 14 support for now (and by extension Mac OS 15) as it
  is on the M1+ ARM processor set and there seems to be some linker
  issues.
---
 .github/workflows/macos-ci.yml |  5 +++--
 script/cibuild                 | 17 +++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
index 69c15b34b4..024f45168e 100644
--- a/.github/workflows/macos-ci.yml
+++ b/.github/workflows/macos-ci.yml
@@ -21,9 +21,10 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          # x86-64
           - macos-13
-          - macos-14
-            # M1 processor
+          # M1 processor
+          #- macos-14
         compiler:
           - clang
           - gcc
diff --git a/script/cibuild b/script/cibuild
index f9a9b8f17f..07c2a6078c 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -61,12 +61,11 @@ then
 
     HOMEBREW_PREFIX="$(brew --prefix)"
     HOMEBREW_BIN="${HOMEBREW_PREFIX}/bin"
-    # $(brew --prefix python) links to the wrong version of Python for Boost so while:
-    # HOMEBREW_PYTHON_BIN="$(brew --prefix python)/libexec/bin"
-    # would be preferred we need to do the following instead:
-    #HOMEBREW_PYTHON_BIN="${HOMEBREW_PREFIX}/opt/python@${BUILD_WITH_PYTHON_VERSION}/libexec/bin"
     HOMEBREW_PYTHON_BIN="$(brew --prefix python)/libexec/bin"
 
+    # NOTE: we do not support builds on MacOS ARM right now as there are some linker errors.
+    #   Any help in making those work would be appreciated.
+
     echo "Build With Python Version: ${BUILD_WITH_PYTHON_VERSION}"
     echo "          Homebrew Prefix: ${HOMEBREW_PREFIX}"
     echo "             Homebrew Bin: ${HOMEBREW_BIN}"
@@ -74,21 +73,15 @@ then
 
     # Homebrew tooling needs to come first in the path search
     export PATH=${HOMEBREW_BIN}:${HOMEBREW_PYTHON_BIN}:${PATH}
-    #echo "Review Homebrew Applications:"
-    #ls ${HOMEBREW_BIN}
-    #echo "Review Homebrew Python Applications:"
-    #ls ${HOMEBREW_PYTHON_BIN}
 
     HOMEBREW_PYTHON_VERSION=$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION} -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
     echo "  Detected Python Version: ${HOMEBREW_PYTHON_VERSION}"
 
     # Ensure it uses the correct Python version
-    #export PYTHONHOME="${HOMEBREW_BIN}/lib/python${HOMEBREW_PYTHON_VERSION}"
-    #export PYTHONPATH="${HOMEBREW_BIN}/lib/python${HOMEBREW_PYTHON_VERSION}/site-packages"
+    # Do not set PYTHONHOME or PYTHONPATH; otherwise some odd errors will come up as
+    # it's not necessary
     export HOMEBREW_PYTHON3_CFLAGS="$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION}-config --cflags)"
     export HOMEBREW_PYTHON3_LDFLAGS="$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION}-config --ldflags)"
-    #echo "              Python Home: ${PYTHONHOME}"
-    #echo "              Python Path: ${PYTHONPATH}"
     echo "   Homebrew Python CFlags: ${HOMEBREW_PYTHON3_CLFLAGS}"
     echo "  Homebrew Python LDFlags: ${HOMEBREW_PYTHON3_LDFLAGS}"