X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=a0de62d91b6e5ec91d4f905de1a4569b6064a78e;hb=dfcb6f50a607b6b402b4f8fa3d43792d61c912a5;hp=dd4c283565662a3d8d43a587fcea21bbb3344c4c;hpb=34caef7fc0710623c6894549423813d53f65b303;p=github%2FChocobozzz%2FPeerTube.git diff --git a/scripts/ci.sh b/scripts/ci.sh index dd4c28356..a0de62d91 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -10,11 +10,8 @@ fi killall -q peertube || true retries=3 -jobs=2 runTest () { - retries=3 - jobname=$1 shift @@ -27,7 +24,7 @@ runTest () { joblog="$jobname-ci.log" - parallel -j $jobs \ + parallel -j $jobs --retries $retries \ "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail {}" \ ::: $files @@ -40,7 +37,7 @@ findTestFiles () { } if [ "$1" = "misc" ]; then - npm run build -- --light + npm run build feedsFiles=$(findTestFiles server/tests/feeds) helperFiles=$(findTestFiles server/tests/helpers) @@ -80,11 +77,11 @@ elif [ "$1" = "api-3" ]; then elif [ "$1" = "api-4" ]; then npm run build:server - activitypubFiles=$(findTestFiles server/tests/api/moderation) + moderationFiles=$(findTestFiles server/tests/api/moderation) redundancyFiles=$(findTestFiles server/tests/api/redundancy) activitypubFiles=$(findTestFiles server/tests/api/activitypub) - MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $activitypubFiles $redundancyFiles $activitypubFiles + MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles elif [ "$1" = "external-plugins" ]; then npm run build:server