Skip to content

Commit 6752666

Browse files
committed
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 704e13f commit 6752666

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,9 @@ jobs:
627627
python_ver: "3.13"
628628
simd: sse4.2,avx2
629629
ctest_test_timeout: 1200
630-
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0 INSTALL_QT=0
630+
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0
631+
INSTALL_QT=0 INSTALL_OPENCV=0
632+
optional_deps_append: 'OpenCV;Qt5;Qt6'
631633
benchmark: 1
632634
- desc: MacOS-14-ARM aclang15/C++20/py3.13
633635
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)