aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rwxr-xr-xscripts/travis.sh2
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
45script: 45script:
46 - travis_retry (killall -q peertube || true) && npm run travis -- "$TEST_SUITE" 46 - travis_retry npm run travis -- "$TEST_SUITE"
47 47
48after_failure: 48after_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
8fi 8fi
9 9
10killall -q peertube || true
11
10if [ "$1" = "misc" ]; then 12if [ "$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 \