Improve blacklist management

[github/Chocobozzz/PeerTube.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1ca6ea886163a2cdcbd0a341784190edc8cd90dc..ecb44c514dae9daf6e97fc041a21084a0d1a9f98 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,17 @@
 language: node_js
 
 node_js:
-  - "6"
+  - "8"
 
-env:
-  - CXX=g++-4.8
+git:
+  depth: 1
 
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-4.8
+      - g++-4.9
   postgresql: "9.4"
 
 cache: yarn
@@ -20,20 +20,17 @@ sudo: false
 
 services:
   - postgresql
+  - redis-server
+
+install:
+  - CC=gcc-4.9 CXX=g++-4.9 yarn install
 
 before_script:
-  - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz"
-  - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz
+  - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.2-64bit-static.tar.xz"
+  - tar xf ffmpeg-release-4.0.2-64bit-static.tar.xz
   - mkdir -p $HOME/bin
-  - cp ffmpeg-*-64bit-static/{ffmpeg,ffprobe,ffserver} $HOME/bin
+  - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin
   - export PATH=$HOME/bin:$PATH
-  - export NODE_TEST_IMAGE=true
-  - psql -c 'create database peertube_test1;' -U postgres
-  - psql -c 'create database peertube_test2;' -U postgres
-  - psql -c 'create database peertube_test3;' -U postgres
-  - psql -c 'create database peertube_test4;' -U postgres
-  - psql -c 'create database peertube_test5;' -U postgres
-  - psql -c 'create database peertube_test6;' -U postgres
   - psql -c "create user peertube with password 'peertube';" -U postgres
 
 matrix:
@@ -45,7 +42,7 @@ matrix:
   - env: TEST_SUITE=lint
 
 script:
-  - npm run travis -- "$TEST_SUITE"
+  - travis_retry npm run travis -- "$TEST_SUITE"
 
 after_failure:
   - cat test1/logs/all-logs.log