Skip to content

Commit 3309e3a

Browse files
committed
*FIXME* Skip building custom ffmpeg for now
Also don't install Qt which should be already installed
1 parent 2122f20 commit 3309e3a

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

travis_config.sh

+7-13
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if [ -n "$IS_OSX" ]; then
4545
source travis_osx_brew_cache.sh
4646

4747
BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \
48-
"ffmpeg_opencv 18" \
48+
"ffmpeg_opencv 2" \
4949
)
5050

5151
function generate_ffmpeg_formula {
@@ -112,7 +112,7 @@ 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)"
@@ -121,21 +121,15 @@ function pre_build {
121121
echo 'Installing FFmpeg'
122122

123123
if [ -n "$CACHE_STAGE" ]; then
124-
brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
124+
brew_install_and_cache_within_time_limit ffmpeg || { [ $? -gt 1 ] && return 2 || return 0; }
125125
else
126126
brew unlink python@2
127-
brew install ffmpeg_opencv
128-
ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
129-
echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"
127+
set +e
128+
brew install ffmpeg
129+
set -e
130130
fi
131131

132-
echo 'Installing qt5'
133-
134-
if [ -n "$CACHE_STAGE" ]; then
135-
echo "Qt5 has bottle, no caching needed"
136-
else
137-
138-
brew pin qt
132+
if [ -z "$CACHE_STAGE" ]; then
139133
export PATH="/usr/local/opt/qt/bin:$PATH"
140134
ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
141135
echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"

0 commit comments

Comments
 (0)