aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBigard Florian <florian.bigard@gmail.com>2016-05-11 23:00:44 +0200
committerBigard Florian <florian.bigard@gmail.com>2016-05-11 23:00:44 +0200
commit6f1b0869809593af36e5ea6a675b6a32a1172f20 (patch)
treed2d824dc83068bc26c3ce3117b7f1852ee47eadb
parentb4c5a1f8ea0249ea48089b7fbc324c1d8de57219 (diff)
downloadPeerTube-6f1b0869809593af36e5ea6a675b6a32a1172f20.tar.gz
PeerTube-6f1b0869809593af36e5ea6a675b6a32a1172f20.tar.zst
PeerTube-6f1b0869809593af36e5ea6a675b6a32a1172f20.zip
Try another method to install latest ffmpeg
-rw-r--r--.travis.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index a5c55e4fc..0d271c8a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
14 packages: 14 packages:
15 - g++-4.8 15 - g++-4.8
16 16
17sudo: true 17sudo: false
18 18
19services: 19services:
20 - mongodb 20 - mongodb
@@ -22,9 +22,10 @@ services:
22before_script: 22before_script:
23 - npm install electron-prebuilt -g 23 - npm install electron-prebuilt -g
24 - npm run build 24 - npm run build
25 - sudo add-apt-repository ppa:pavlyshko/precise -y 25 - mkdir ffmpeg
26 - sudo apt-get update -q 26 - wget "http://ffmpeg.gusari.org/static/64bit/ffmpeg.static.64bit.latest.tar.gz"
27 - sudo apt-get install ffmpeg -y 27 - tar xzf ffmpeg.static.64bit.latest.tar.gz -C ffmpeg
28 - export PATH=`pwd`/ffmpeg:$PATH
28 29
29after_failure: 30after_failure:
30 - cat test1/logs/all-logs.log 31 - cat test1/logs/all-logs.log