Skip to content

Commit

Permalink
Merge pull request #267 from mbdevpl/travis-ci-fix
Browse files Browse the repository at this point in the history
Fix for #266 - don't use deprecated brew tap-pin, instead refer to the full package name when installing
  • Loading branch information
skvark committed Dec 7, 2019
2 parents 841efa0 + 852f34d commit 4352c62
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions travis_config.sh
Expand Up @@ -98,11 +98,10 @@ function pre_build {

echo 'Installing QT4'
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
brew tap --list-pinned | grep -qxF cartr/qt4 || brew tap-pin cartr/qt4
if [ -n "$CACHE_STAGE" ]; then
brew_install_and_cache_within_time_limit qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
else
brew install qt@4
brew install cartr/qt4/qt@4
fi

echo 'Installing FFmpeg'
Expand Down

0 comments on commit 4352c62

Please sign in to comment.