aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBigard Florian <florian.bigard@gmail.com>2016-05-11 09:41:09 +0200
committerBigard Florian <florian.bigard@gmail.com>2016-05-11 09:41:09 +0200
commita8750eb5826eeda9720eb95b493a3c1f80f91cbb (patch)
treedbf8218674f97fae832ed6ecae4eb588140f6f7e
parent15e3cdaafca7c0362aaf6afb39804e08477af0ad (diff)
downloadPeerTube-a8750eb5826eeda9720eb95b493a3c1f80f91cbb.tar.gz
PeerTube-a8750eb5826eeda9720eb95b493a3c1f80f91cbb.tar.zst
PeerTube-a8750eb5826eeda9720eb95b493a3c1f80f91cbb.zip
Try to fix ffmpeg in travis build
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index cd6e3afde..5c207a470 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,8 @@ addons:
13 - ubuntu-toolchain-r-test 13 - ubuntu-toolchain-r-test
14 packages: 14 packages:
15 - g++-4.8 15 - g++-4.8
16 - ffmpeg
17 16
18sudo: false 17sudo: true
19 18
20services: 19services:
21 - mongodb 20 - mongodb
@@ -23,6 +22,9 @@ services:
23before_script: 22before_script:
24 - npm install electron-prebuilt -g 23 - npm install electron-prebuilt -g
25 - npm run build 24 - npm run build
25 - sudo add-apt-repository ppa:mc3man/trusty-media -y
26 - sudo apt-get update -q
27 - sudo apt-get install ffmpeg -y
26 28
27after_failure: 29after_failure:
28 - cat test1/logs/all-logs.log 30 - cat test1/logs/all-logs.log