From 005c8e7e0a23485525db7513aa34ea62574dde1c Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Mon, 30 Sep 2024 12:05:19 -0700 Subject: [PATCH] Don't exclude MacOS 12, just disable OpenCV and Qt homebrew install for it Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 9 +++++++++ src/build-scripts/install_homebrew_deps.bash | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d57120af8..10746da1e8 100644 --- 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 index b79f936e39..0c0fd56aab 100755 --- 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