diff options
author | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
commit | 73b3aa6429dfb2e31628fa09a479dce318289d7d (patch) | |
tree | 88cf5c7c49ba89c18633a4a64a4acfc8d40b4a50 /.travis.yml | |
parent | fd822c1c699fb89bb1c3218e047e1d842bc1ba1a (diff) | |
parent | 618750486ee2732e0ad3525349e4d42f29e1803e (diff) | |
download | PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.gz PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.zst PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.zip |
Merge branch 'feature/audio-upload' into develop
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5fa41fb43..8b3ec94d9 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -29,8 +29,8 @@ install: | |||
29 | - CC=gcc-4.9 CXX=g++-4.9 yarn install | 29 | - CC=gcc-4.9 CXX=g++-4.9 yarn install |
30 | 30 | ||
31 | before_script: | 31 | before_script: |
32 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.2-64bit-static.tar.xz" | 32 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.3-64bit-static.tar.xz" |
33 | - tar xf ffmpeg-release-4.0.2-64bit-static.tar.xz | 33 | - tar xf ffmpeg-release-4.0.3-64bit-static.tar.xz |
34 | - mkdir -p $HOME/bin | 34 | - mkdir -p $HOME/bin |
35 | - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin | 35 | - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin |
36 | - export PATH=$HOME/bin:$PATH | 36 | - export PATH=$HOME/bin:$PATH |