Unverified Commit 587fa559 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #254 from native-api/oclint_workaround

Remove "remove OCLint" workaround

Since https://github.com/travis-ci/travis-build/commit/52c6b6cc1d537e52c8ae6f0906944d6fcaa3d173, it's no longer needed

and may trigger stuff like [unnecessary `git clone`s](https://travis-ci.org/skvark/opencv-python/jobs/569294041#L2310).
parents 4cdd1927 8d4f8907
...@@ -92,8 +92,6 @@ function build_github { ...@@ -92,8 +92,6 @@ function build_github {
function build_openblas { function build_openblas {
if [ -e openblas-stamp ]; then return; fi if [ -e openblas-stamp ]; then return; fi
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
# https://github.com/travis-ci/travis-ci/issues/8826
brew cask uninstall oclint || echo "no oclint"
brew install openblas brew install openblas
brew link --force openblas brew link --force openblas
else else
......
...@@ -18,8 +18,6 @@ source $MULTIBUILD_DIR/library_builders.sh ...@@ -18,8 +18,6 @@ source $MULTIBUILD_DIR/library_builders.sh
# config.sh can override any function defined here. # config.sh can override any function defined here.
function before_install { function before_install {
# Uninstall oclint. See Travis-CI gh-8826
brew cask uninstall oclint || true
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
get_macpython_environment $MB_PYTHON_VERSION venv get_macpython_environment $MB_PYTHON_VERSION venv
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment