diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-07-31 10:26:13 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-07-31 10:26:13 +0200 |
| commit | 365b546c9fbc2a8a7f9c7de7da25209cd83e73d8 (patch) | |
| tree | a36374954dce3ae45424e6dc6bc7ff76b2ec3cd0 | |
| parent | dcc5be25f6a098c85693ef68ddad6a1230c8fece (diff) | |
| download | PeerTube-365b546c9fbc2a8a7f9c7de7da25209cd83e73d8.tar.gz PeerTube-365b546c9fbc2a8a7f9c7de7da25209cd83e73d8.tar.zst PeerTube-365b546c9fbc2a8a7f9c7de7da25209cd83e73d8.zip | |
Try to fix travis (again)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/travis.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6e9f740b5..f9300f7ff 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -43,7 +43,7 @@ matrix: | |||
| 43 | - env: TEST_SUITE=lint | 43 | - env: TEST_SUITE=lint |
| 44 | 44 | ||
| 45 | script: | 45 | script: |
| 46 | - travis_retry (killall -q peertube || true) && npm run travis -- "$TEST_SUITE" | 46 | - travis_retry npm run travis -- "$TEST_SUITE" |
| 47 | 47 | ||
| 48 | after_failure: | 48 | after_failure: |
| 49 | - cat test1/logs/all-logs.log | 49 | - cat test1/logs/all-logs.log |
diff --git a/scripts/travis.sh b/scripts/travis.sh index a5f604bb1..390500ed4 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh | |||
| @@ -7,6 +7,8 @@ if [ $# -eq 0 ]; then | |||
| 7 | exit -1 | 7 | exit -1 |
| 8 | fi | 8 | fi |
| 9 | 9 | ||
| 10 | killall -q peertube || true | ||
| 11 | |||
| 10 | if [ "$1" = "misc" ]; then | 12 | if [ "$1" = "misc" ]; then |
| 11 | npm run build | 13 | npm run build |
| 12 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \ | 14 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \ |