X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=f4a200a002bd62f043a4d001a7f067ec106ea4d9;hb=12fa2a6a9ab3af53e2f9461ed36f8c0a3f88776f;hp=84254cbc047b09f2a1ef5dbc352d8cf7f9e09b8d;hpb=17ae86e9128c090b02494dd1ba10bdc41cd86936;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 84254cbc0..f4a200a00 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,27 +24,27 @@ runTest () {
 
     joblog="$jobname-ci.log"
 
-    parallel -t -j $jobs --retries $retries --joblog "$joblog" \
-        npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
+    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
 
-    cat "$joblog"
+    cat "$joblog" | uniq -c
     rm "$joblog"
 }
 
 findTestFiles () {
-    find $1 -type f -name "*.ts" | grep -v index.ts | xargs echo
+    find $1 -type f -name "*.ts" | grep -v "/index.ts" | xargs echo
 }
 
 if [ "$1" = "misc" ]; then
-    npm run build -- --light
+    npm run build
 
     feedsFiles=$(findTestFiles server/tests/feeds)
     helperFiles=$(findTestFiles server/tests/helpers)
     pluginsFiles=$(findTestFiles server/tests/plugins)
     miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
 
-    TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
+    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
 elif [ "$1" = "cli" ]; then
     npm run build:server
     npm run setup:cli
@@ -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