Don't exclude MacOS 12, just disable OpenCV and Qt homebrew install f…

…or it Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz · Sep 30, 2024 · 005c8e7 · 005c8e7
1 parent 3e9c45c
commit 005c8e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -506,6 +506,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - desc: MacOS-12
+            runner: macos-12
+            nametag: macos12-py310
+            cc_compiler: clang
+            cxx_compiler: clang++
+            cxx_std: 17
+            python_ver: "3.11"
+            aclang: 13
+            setenvs: export INSTALL_QT=0 INSTALL_OPENCV=0
           - desc: MacOS-13
             runner: macos-13
             nametag: macos13-py311

diff --git a/src/build-scripts/install_homebrew_deps.bash b/src/build-scripts/install_homebrew_deps.bash
@@ -44,10 +44,10 @@ brew install --display-times -q freetype libraw dcmtk pybind11 numpy || true
 brew install --display-times -q ffmpeg libheif ptex || true
 brew install --display-times -q tbb || true
 brew install --display-times -q openvdb || true
-if [[ "${USE_OPENCV}" != "0" ]] ; then
+if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
     brew install --display-times -q opencv || true
 fi
-if [[ "${USE_QT}" != "0" ]] ; then
+if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
     brew install --display-times -q qt${QT_VERSION}
 fi
 if [[ "${USE_LLVM:=0}" != "0" ]] || [[ "${LLVMBREWVER}" != "" ]]; then