diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /.travis.yml | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e6a92d883..7b025f0b9 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | language: node_js | 1 | language: node_js |
| 2 | 2 | ||
| 3 | node_js: | 3 | node_js: |
| 4 | - "4.4" | 4 | - "4.5" |
| 5 | - "6.2" | 5 | - "6.6" |
| 6 | 6 | ||
| 7 | env: | 7 | env: |
| 8 | - CXX=g++-4.8 | 8 | - CXX=g++-4.8 |
| @@ -19,8 +19,10 @@ sudo: false | |||
| 19 | services: | 19 | services: |
| 20 | - mongodb | 20 | - mongodb |
| 21 | 21 | ||
| 22 | before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi | ||
| 23 | |||
| 22 | before_script: | 24 | before_script: |
| 23 | - npm install electron-prebuilt -g | 25 | - npm install electron -g |
| 24 | - npm run build | 26 | - npm run build |
| 25 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz" | 27 | - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz" |
| 26 | - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz | 28 | - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz |