From 13fe3ff3b9a714caa42135680b5d4ffbf172549a Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Sun, 1 Mar 2026 20:59:47 -0800
Subject: [PATCH] ci: On Mac Intel CI variant, unbreak again, and don't insall
 openvdb

Lately, some Mac Intel CI runs have taken forever or failed because of
timeout. It appears to be because some packages are maybe not cached
(bottled) for Intel anymore? It only happens sometimes, so maybe it
fails when the package version has just been bumped, but eventually
somebody published a pre-built bottle and then it's ok?

openvdb and its dependencies seem to be a frequent culprit. Let's
just skip them for this one soon-to-be-obosolete variant.

And literally while working on this, it broke in two more ways:
* Need expat added to install list.
* Bump to new python version, or numpy doesn't work on this runner.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
---
 .github/workflows/ci.yml                     |  6 +++---
 src/build-scripts/install_homebrew_deps.bash | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ffdf961b9e..beeac9b1e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -608,12 +608,12 @@ jobs:
             cc_compiler: clang
             cxx_compiler: clang++
             cxx_std: 17
-            python_ver: "3.13"
+            python_ver: "3.14"
             simd: sse4.2,avx2
             ctest_test_timeout: 1200
             setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0
-                            INSTALL_QT=0 INSTALL_OPENCV=0
-            optional_deps_append: 'OpenCV;Qt5;Qt6'
+                            INSTALL_QT=0 INSTALL_OPENCV=0 INSTALL_OPENVDB=0
+            optional_deps_append: 'OpenCV;OpenVDB;Qt5;Qt6'
             benchmark: 1
           - desc: MacOS-14-ARM aclang15/C++20/py3.13
             runner: macos-14
diff --git a/src/build-scripts/install_homebrew_deps.bash b/src/build-scripts/install_homebrew_deps.bash
index e8cfe2bc59..b26e35a93d 100755
--- a/src/build-scripts/install_homebrew_deps.bash
+++ b/src/build-scripts/install_homebrew_deps.bash
@@ -32,6 +32,7 @@ if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
     OIIO_BREW_INSTALL_PACKAGES=" \
         ccache \
         dcmtk \
+        expat \
         ffmpeg \
         imath \
         libheif \
@@ -41,7 +42,6 @@ if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
         opencolorio \
         openexr \
         openjpeg \
-        openvdb \
         ptex \
         pybind11 \
         robin-map \
@@ -50,6 +50,9 @@ if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
     if [[ "${USE_OPENCV:=}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
         OIIO_BREW_INSTALL_PACKAGES+=" opencv"
     fi
+    if [[ "${USE_OPENVDB:=1}" != "0" ]] && [[ "${INSTALL_OPENVDB:=1}" != "0" ]] ; then
+        OIIO_BREW_INSTALL_PACKAGES+=" openvdb"
+    fi
     if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
         OIIO_BREW_INSTALL_PACKAGES+=" qt${QT_VERSION}"
     fi
@@ -62,9 +65,9 @@ brew list --versions
 
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
-export PATH=/usr/local/opt/qt5/bin:$PATH
-export PATH=/usr/local/opt/python/libexec/bin:$PATH
-export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+export PATH=${HOMEBREW_PREFIX}/opt/qt5/bin:$PATH
+export PATH=${HOMEBREW_PREFIX}/opt/python/libexec/bin:$PATH
+export PYTHONPATH=${HOMEBREW_PREFIX}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 
 # Save the env for use by other stages
 src/build-scripts/save-env.bash