nolanlawson
/
pinafore
forked from cybrespace/pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chore(travis): download ffmpeg static file (#636)

This commit is contained in:
Nolan Lawson 2018-11-11 21:34:59 -08:00 committed by GitHub
parent 31c6f152c1
commit 8ff174b42d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -67,3 +67,4 @@ cache:
bundler: true bundler: true
directories: directories:
- /home/travis/.rvm/ - /home/travis/.rvm/
- /home/travis/ffmpeg-static/

16
bin/setup-mastodon-in-travis.sh
View File

@ -18,10 +18,18 @@ sudo mv redis.conf /etc/redis
sudo service redis-server start sudo service redis-server start
echo PING | nc localhost 6379 # check redis running echo PING | nc localhost 6379 # check redis running
# install ffmpeg from PPA because it's not in Trusty # install ffmpeg because it's not in Trusty
sudo -E add-apt-repository -y ppa:mc3man/trusty-media if [ ! -f /home/travis/ffmpeg-static/ffmpeg ]; then
sudo -E apt-get update rm -fr /home/travis/ffmpeg-static
sudo -E apt-get install -yq --no-install-suggests --no-install-recommends ffmpeg mkdir -p /home/travis/ffmpeg-static
curl -sL \
-A 'https://github.com/nolanlawson/pinafore' \
-o ffmpeg.tar.xz \
'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz'
tar -x -C /home/travis/ffmpeg-static --strip-components 1 -f ffmpeg.tar.xz --wildcards '*/ffmpeg' --wildcards '*/ffprobe'
fi
sudo ln -s /home/travis/ffmpeg-static/ffmpeg /usr/local/bin/ffmpeg
sudo ln -s /home/travis/ffmpeg-static/ffprobe /usr/local/bin/ffprobe
# check versions # check versions
ruby --version ruby --version