fix: fix ffmpeg install in travis (#1318)
This commit is contained in:
parent
7fd6cdc22c
commit
cfc182a836
|
@ -41,6 +41,10 @@ before_install:
|
||||||
# install yarn
|
# install yarn
|
||||||
- curl -o- -L https://yarnpkg.com/install.sh | bash -s
|
- curl -o- -L https://yarnpkg.com/install.sh | bash -s
|
||||||
- export PATH="$HOME/.yarn/bin:$PATH"
|
- export PATH="$HOME/.yarn/bin:$PATH"
|
||||||
|
# install ffmpeg
|
||||||
|
- sudo add-apt-repository -y ppa:mc3man/trusty-media
|
||||||
|
- sudo apt-get update
|
||||||
|
- sudo apt-get install -y ffmpeg
|
||||||
- ./bin/setup-mastodon-in-travis.sh
|
- ./bin/setup-mastodon-in-travis.sh
|
||||||
before_script:
|
before_script:
|
||||||
- yarn run lint
|
- yarn run lint
|
||||||
|
@ -70,4 +74,3 @@ cache:
|
||||||
bundler: true
|
bundler: true
|
||||||
directories:
|
directories:
|
||||||
- /home/travis/.rvm/
|
- /home/travis/.rvm/
|
||||||
- /home/travis/ffmpeg-static/
|
|
||||||
|
|
|
@ -18,19 +18,6 @@ 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 because it's not in Trusty
|
|
||||||
if [ ! -f /home/travis/ffmpeg-static/ffmpeg ]; then
|
|
||||||
rm -fr /home/travis/ffmpeg-static
|
|
||||||
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
|
||||||
node --version
|
node --version
|
||||||
|
|
Loading…
Reference in New Issue