projects
/
oweals
/
peertube.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15e3cda
)
Try to fix ffmpeg in travis build
author
Bigard Florian
<florian.bigard@gmail.com>
Wed, 11 May 2016 07:41:09 +0000
(09:41 +0200)
committer
Bigard Florian
<florian.bigard@gmail.com>
Wed, 11 May 2016 07:41:09 +0000
(09:41 +0200)
.travis.yml
patch
|
blob
|
history
diff --git
a/.travis.yml
b/.travis.yml
index cd6e3afdec92dc2e53de5bef94b3a53eb07bf6cd..5c207a470bc60efdaa2ecf8faeb80dda846adbd4 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-13,9
+13,8
@@
addons:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- - ffmpeg
-sudo:
fals
e
+sudo:
tru
e
services:
- mongodb
@@
-23,6
+22,9
@@
services:
before_script:
- npm install electron-prebuilt -g
- npm run build
+ - sudo add-apt-repository ppa:mc3man/trusty-media -y
+ - sudo apt-get update -q
+ - sudo apt-get install ffmpeg -y
after_failure:
- cat test1/logs/all-logs.log