diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
commit | 99fe265a5fc077cb66c322e7f3d191ff7110aea0 (patch) | |
tree | c9e04ccfcc5496d2300d7c26db5833e494b4cdad /.travis.yml | |
parent | fcc5f77b95d330bfcb439c172b7fcc58f3162e4d (diff) | |
parent | 91cc839af88730ba55f84997c56b85ea100070a7 (diff) | |
download | PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.gz PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.zst PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.zip |
Merge branch 'postgresql'
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9fcd50dee..76efedd50 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.6" | 4 | - "4" |
5 | - "6.9" | 5 | - "6" |
6 | 6 | ||
7 | env: | 7 | env: |
8 | - CXX=g++-4.8 | 8 | - CXX=g++-4.8 |
@@ -13,11 +13,12 @@ addons: | |||
13 | - ubuntu-toolchain-r-test | 13 | - ubuntu-toolchain-r-test |
14 | packages: | 14 | packages: |
15 | - g++-4.8 | 15 | - g++-4.8 |
16 | postgresql: "9.4" | ||
16 | 17 | ||
17 | sudo: false | 18 | sudo: false |
18 | 19 | ||
19 | services: | 20 | services: |
20 | - mongodb | 21 | - postgresql |
21 | 22 | ||
22 | before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi | 23 | before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi |
23 | 24 | ||
@@ -29,6 +30,13 @@ before_script: | |||
29 | - cp ffmpeg-*-64bit-static/{ffmpeg,ffprobe,ffserver} $HOME/bin | 30 | - cp ffmpeg-*-64bit-static/{ffmpeg,ffprobe,ffserver} $HOME/bin |
30 | - export PATH=$HOME/bin:$PATH | 31 | - export PATH=$HOME/bin:$PATH |
31 | - export NODE_TEST_IMAGE=true | 32 | - export NODE_TEST_IMAGE=true |
33 | - psql -c 'create database peertube_test1;' -U postgres | ||
34 | - psql -c 'create database peertube_test2;' -U postgres | ||
35 | - psql -c 'create database peertube_test3;' -U postgres | ||
36 | - psql -c 'create database peertube_test4;' -U postgres | ||
37 | - psql -c 'create database peertube_test5;' -U postgres | ||
38 | - psql -c 'create database peertube_test6;' -U postgres | ||
39 | - psql -c "create user peertube with password 'peertube';" -U postgres | ||
32 | 40 | ||
33 | after_failure: | 41 | after_failure: |
34 | - cat test1/logs/all-logs.log | 42 | - cat test1/logs/all-logs.log |