From b4b1269307bc0d13ce17f1f8c1218416c2344192 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Mon, 30 Sep 2024 14:54:32 -0700 Subject: [PATCH] ci: Streamline the old MacOS-12 CI test (#4465) It's an old flavor not well supported by homebrew any longer, so what's happening is that some of the dependency packages we ask to install have to build from source, which means it takes a long long time. By disabling OpenCV and Qt homebrew installation for it, we can make it fast again. Neither the minimal OpenCV interop, nor osltoy (the only thing that needs Qt) are exercised by the automated testsuite anyway, so I don't think there's any loss of testing functionality in practice. Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 2 +- src/build-scripts/install_homebrew_deps.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47d4cbd2a6..10746da1e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -512,7 +512,7 @@ jobs: cc_compiler: clang cxx_compiler: clang++ cxx_std: 17 - python_ver: "3.10" + python_ver: "3.11" aclang: 13 setenvs: export INSTALL_QT=0 INSTALL_OPENCV=0 - desc: MacOS-13 diff --git a/src/build-scripts/install_homebrew_deps.bash b/src/build-scripts/install_homebrew_deps.bash index 99e88c63c9..0c0fd56aab 100755 --- a/src/build-scripts/install_homebrew_deps.bash +++ b/src/build-scripts/install_homebrew_deps.bash @@ -44,7 +44,7 @@ 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" ]] && [[ "${USE_OPENCV:=1}" != "0" ]] ; then +if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then brew install --display-times -q opencv || true fi if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then