Skip to content

Commit 54f36c4

Browse files
committed
ci: Fix broken Macos-13 CI (#1780)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 5eac061 commit 54f36c4

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/build-scripts/install_homebrew_deps.bash

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ if [[ `which brew` == "" ]] ; then
1919
exit 1
2020
fi
2121

22-
set -ex
22+
# set -ex
2323

24-
if [[ "$DO_BREW_UPDATE" != "" ]] ; then
24+
if [[ "${DO_BREW_UPDATE:=0}" != "0" ]] ; then
2525
brew update >/dev/null
2626
fi
2727
echo ""
@@ -35,11 +35,10 @@ brew install --display-times -q python@${PYTHON_VERSION} || true
3535
# brew unlink [email protected] || true
3636
brew unlink [email protected] || true
3737
brew link --overwrite --force python@${PYTHON_VERSION} || true
38-
brew upgrade --display-times -q cmake || true
39-
brew install --display-times -q imath openexr
38+
#brew upgrade --display-times -q cmake || true
39+
brew install --display-times -q imath openexr opencolorio || true
4040
#brew install --display-times -q freetype
41-
brew install --display-times -q --overwrite --force opencolorio || true
42-
brew install --display-times -q partio pugixml
41+
brew install --display-times -q partio pugixml || true
4342
brew install --display-times -q pybind11 numpy || true
4443
brew install --display-times -q tbb || true
4544
brew install --display-times -q openvdb || true
@@ -55,7 +54,7 @@ echo "After brew installs:"
5554
brew list --versions
5655

5756
# Needed on some systems
58-
pip${PYTHON_VERSION} install numpy
57+
pip${PYTHON_VERSION} install numpy || true
5958

6059
# Set up paths. These will only affect the caller if this script is
6160
# run with 'source' rather than in a separate shell.

0 commit comments

Comments
 (0)