Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for #266 - don't use deprecated brew tap-pin, instead refer to the full package name when installing #267

Merged
merged 1 commit into from Dec 7, 2019
Merged

Fix for #266 - don't use deprecated brew tap-pin, instead refer to the full package name when installing #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions travis_config.sh
View file
Open in desktop
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