Skip to content

Navigation Menu

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 d53115c

Browse filesBrowse files
committed
unlink and reinstall
1 parent 21be118 commit d53115c
Copy full SHA for d53115c

File tree

1 file changed

+10
-8
lines changed
Filter options

1 file changed

+10
-8
lines changed

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+10-8Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ function pre_build {
101101
brew_add_local_bottles
102102
fi
103103

104-
echo 'Installing qt5'
105-
if [ -n "$CACHE_STAGE" ]; then
106-
echo "Qt5 has bottle, no caching needed"
107-
else
108-
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb
109-
export PATH="/usr/local/opt/qt/bin:$PATH"
110-
fi
111-
112104
echo 'Installing FFmpeg'
113105

114106
if [ -n "$CACHE_STAGE" ]; then
@@ -118,6 +110,16 @@ function pre_build {
118110
brew install ffmpeg_opencv
119111
fi
120112

113+
echo 'Installing qt5'
114+
115+
if [ -n "$CACHE_STAGE" ]; then
116+
echo "Qt5 has bottle, no caching needed"
117+
else
118+
brew unlink qt
119+
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb
120+
export PATH="/usr/local/opt/qt/bin:$PATH"
121+
fi
122+
121123
if [ -n "$CACHE_STAGE" ]; then
122124
brew_go_bootstrap_mode 0
123125
return 0

0 commit comments

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