Skip to content

Commit 1188706

Browse files
authored
ci: Don't install OpenCV on Mac Intel job variant (#5032)
Mac Intel is getting long in the tooth, and quite often the Homebrew packages for Intel are found to be uncached and will try to build from source. When it's OpenCV, that's disastrous for our CI build times, it can get stalled for hours building all of OpenCV and its dependencies. So disable it for that one build variant. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 81c54c4 commit 1188706

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,9 @@ jobs:
628628
python_ver: "3.13"
629629
simd: sse4.2,avx2
630630
ctest_test_timeout: 1200
631-
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0 INSTALL_QT=0
631+
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0
632+
INSTALL_QT=0 INSTALL_OPENCV=0
633+
optional_deps_append: 'OpenCV;Qt5;Qt6'
632634
benchmark: 1
633635
- desc: MacOS-14-ARM aclang15/C++20/py3.13
634636
runner: macos-14

src/build-scripts/install_homebrew_deps.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
4747
robin-map \
4848
tbb \
4949
"
50-
if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
50+
if [[ "${USE_OPENCV:=}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
5151
OIIO_BREW_INSTALL_PACKAGES+=" opencv"
5252
fi
5353
if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then

0 commit comments

Comments
 (0)