Skip to content

Commit a85b34c

Browse files
committed
*FIXME* Skip building custom ffmpeg for now
And don't install Qt which should be already installed
1 parent 86c03c8 commit a85b34c

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

travis_config.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,31 +112,26 @@ function pre_build {
112112
pkg=libass; brew list $pkg > /dev/null && brew rm $pkg
113113

114114
brew update
115-
generate_ffmpeg_formula
115+
#generate_ffmpeg_formula
116116
brew_add_local_bottles
117117
ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
118118
echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"
119119
fi
120120

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
126122
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
131128
fi
132129

133130
echo 'Installing qt5'
134131

135132
if [ -n "$CACHE_STAGE" ]; then
136133
echo "Qt5 has bottle, no caching needed"
137134
else
138-
brew link qt@5.15.2
139-
brew pin qt
140135
export PATH="/usr/local/opt/qt/bin:$PATH"
141136
ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
142137
echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"

0 commit comments

Comments
 (0)