From cfc182a83686b565a7d4ed8cb6e96255a0dc7e8f Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 7 Jul 2019 17:39:20 -0700
Subject: [PATCH] fix: fix ffmpeg install in travis (#1318)

---
 .travis.yml                     |  5 ++++-
 bin/setup-mastodon-in-travis.sh | 13 -------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b406691..e238864a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,10 @@ before_install:
   # install yarn
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s
   - 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
 before_script:
   - yarn run lint
@@ -70,4 +74,3 @@ cache:
   bundler: true
   directories:
   - /home/travis/.rvm/
-  - /home/travis/ffmpeg-static/
diff --git a/bin/setup-mastodon-in-travis.sh b/bin/setup-mastodon-in-travis.sh
index d145ce0f..5ff8baee 100755
--- a/bin/setup-mastodon-in-travis.sh
+++ b/bin/setup-mastodon-in-travis.sh
@@ -18,19 +18,6 @@ sudo mv redis.conf /etc/redis
 sudo service redis-server start
 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
 ruby --version
 node --version