diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-19 23:21:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 23:21:00 +0200 |
| commit | 2e4afccd9d5327c072cf0a0fe5d4c6e97ecc10cf (patch) | |
| tree | 1f7c6a8b165d65b1d50f635af683251400c9ce34 /.travis.yml | |
| parent | 0876a06e4544bc0946f3f6d884c7e2507ee12def (diff) | |
Fix #2108 - Fix gif uploads (#2171)
* Fix #2108 - Fix gif uploads Add specs for media attachment gifv conversion * Add ffmpeg to travis * Make travis install ffmpeg, not libav * Switch travis to trusty
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 564155c66..9725f4993 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: ruby cache: bundler +dist: trusty +sudo: required notifications: email: false @@ -24,8 +26,9 @@ bundler_args: --without development production --retry=3 --jobs=3 before_install: - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo add-apt-repository -y ppa:mc3man/trusty-media - sudo apt-get -qq update - - sudo apt-get -qq install g++-4.8 + - sudo apt-get -qq install g++-4.8 ffmpeg install: - nvm install - npm install -g yarn |