File tree Expand file tree Collapse file tree 1 file changed +7
-12
lines changed Expand file tree Collapse file tree 1 file changed +7
-12
lines changed Original file line number Diff line number Diff line change @@ -112,31 +112,26 @@ function pre_build {
112
112
pkg=libass; brew list $pkg > /dev/null && brew rm $pkg
113
113
114
114
brew update
115
- generate_ffmpeg_formula
115
+ # generate_ffmpeg_formula
116
116
brew_add_local_bottles
117
117
ELAPSED_TIME=$(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
118
118
echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m (${ELAPSED_TIME} s)"
119
119
fi
120
120
121
- echo ' Installing FFmpeg'
122
-
123
- if [ -n " $CACHE_STAGE " ]; then
124
- brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
125
- else
121
+ if [ -z " $CACHE_STAGE " ]; then
126
122
brew unlink python@2
127
- generate_ffmpeg_formula
128
- brew install ffmpeg_opencv
129
- ELAPSED_TIME=$(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
130
- echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m (${ELAPSED_TIME} s)"
123
+ # generate_ffmpeg_formula
124
+ echo ' Installing FFmpeg'
125
+ set +e
126
+ brew install ffmpeg
127
+ set -e
131
128
fi
132
129
133
130
echo ' Installing qt5'
134
131
135
132
if [ -n " $CACHE_STAGE " ]; then
136
133
echo " Qt5 has bottle, no caching needed"
137
134
else
138
- brew link qt@5.15.2
139
- brew pin qt
140
135
export PATH=" /usr/local/opt/qt/bin:$PATH "
141
136
ELAPSED_TIME=$(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
142
137
echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m (${ELAPSED_TIME} s)"
You can’t perform that action at this time.
0 commit comments