Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4352c62

Browse filesBrowse files
authored
Merge pull request opencv#267 from mbdevpl/travis-ci-fix
Fix for opencv#266 - don't use deprecated brew tap-pin, instead refer to the full package name when installing
2 parents 841efa0 + 852f34d commit 4352c62
Copy full SHA for 4352c62

File tree

Expand file treeCollapse file tree

1 file changed

+2
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-3
lines changed

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,10 @@ function pre_build {
9898

9999
echo 'Installing QT4'
100100
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
101-
brew tap --list-pinned | grep -qxF cartr/qt4 || brew tap-pin cartr/qt4
102101
if [ -n "$CACHE_STAGE" ]; then
103-
brew_install_and_cache_within_time_limit qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
102+
brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
104103
else
105-
brew install qt@4
104+
brew install cartr/qt4/qt@4
106105
fi
107106

108107
echo 'Installing FFmpeg'

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.