X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.travis.yml;h=3d287a7828f52cd3b4b23db87f1e1344cb7e2fee;hb=df8c65d783cca3258c891f309aad0b8f39b7cda8;hp=1ca6ea886163a2cdcbd0a341784190edc8cd90dc;hpb=98ec8b8e73a918d5680e6f13aaef56ca8756c2a8;p=oweals%2Fpeertube.git

diff --git a/.travis.yml b/.travis.yml
index 1ca6ea886..3d287a782 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,56 +1,58 @@
 language: node_js
 
 node_js:
-  - "6"
+  - "10"
 
-env:
-  - CXX=g++-4.8
+git:
+  depth: 1
 
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-4.8
-  postgresql: "9.4"
+      - g++-4.9
+  postgresql: "9.6"
 
-cache: yarn
+cache:
+  directories:
+    - $HOME/.cache/yarn
+    - $HOME/fixtures
 
 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.3-64bit-static.tar.xz"
+  - tar xf ffmpeg-release-4.0.3-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:
   include:
   - env: TEST_SUITE=misc
-  - env: TEST_SUITE=api-fast
-  - env: TEST_SUITE=api-slow
+  - env: TEST_SUITE=api-1
+  - env: TEST_SUITE=api-2
+  - env: TEST_SUITE=api-3
+  - env: TEST_SUITE=api-4
   - env: TEST_SUITE=cli
   - env: TEST_SUITE=lint
 
 script:
-  - npm run travis -- "$TEST_SUITE"
+  - NODE_PENDING_JOB_WAIT=2000 travis_retry npm run ci -- "$TEST_SUITE"
 
 after_failure:
-  - cat test1/logs/all-logs.log
-  - cat test2/logs/all-logs.log
-  - cat test3/logs/all-logs.log
-  - cat test4/logs/all-logs.log
-  - cat test5/logs/all-logs.log
-  - cat test6/logs/all-logs.log
+  - cat test1/logs/peertube.log
+  - cat test2/logs/peertube.log
+  - cat test3/logs/peertube.log
+  - cat test4/logs/peertube.log
+  - cat test5/logs/peertube.log
+  - cat test6/logs/peertube.log