X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=07e37e0eee82ce393f20ac7634e5c03b795d2c9f;hb=0ca454e3bdf89390d1a48760ab555ddd8725c82d;hp=238eba371264d2c9fc1b0cc808167abcbf6f25b9;hpb=c8f3cfeba7acc2ab9c5f03161d22856202a49326;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 238eba371..07e37e0ee 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -10,79 +10,95 @@ fi
 killall -q peertube || true
 
 retries=3
-jobs=2
 
 runTest () {
-    retries=3
+    jobname=$1
+    shift
+
     jobs=$1
     shift
+
     files=$@
 
     echo $files
 
-    parallel -t -j $jobs --retries $retries \
-        npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
+    joblog="$jobname-ci.log"
+
+    parallel -j $jobs --retries $retries \
+        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ./dist/server/tests/register.js --bail {}" \
         ::: $files
+
+    cat "$joblog" | uniq -c
+    rm "$joblog"
 }
 
 findTestFiles () {
-    find $1 -type f -name "*.ts" | grep -v index.ts | xargs echo
+    exception="-not -name index.js"
+
+    if [ ! -z ${2+x} ]; then
+        exception="$exception -not -name $2"
+    fi
+
+    find $1 -type f -name "*.js" $exception | xargs echo
 }
 
-if [ "$1" = "misc" ]; then
-    npm run build -- --light
+if [ "$1" = "client" ]; then
+    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"
+    feedsFiles=$(findTestFiles ./dist/server/tests/feeds)
+    helperFiles=$(findTestFiles ./dist/server/tests/helpers)
+    miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
+    # Not in plugin task, it needs an index.html
+    pluginFiles="./dist/server/tests/plugins/html-injection.js"
 
-    TS_NODE_FILES=true runTest 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
-elif [ "$1" = "cli" ]; then
+    MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles
+elif [ "$1" = "cli-plugin" ]; then
     npm run build:server
     npm run setup:cli
 
-    cliFiles=$(findTestFiles server/tests/cli)
+    pluginsFiles=$(findTestFiles ./dist/server/tests/plugins html-injection.js)
+    cliFiles=$(findTestFiles ./dist/server/tests/cli)
 
-    runTest 1 $cliFiles
+    MOCHA_PARALLEL=true runTest "$1" 2 $pluginsFiles
+    runTest "$1" 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
 
-    checkParamFiles=$(findTestFiles server/tests/api/check-params)
-    notificationsFiles=$(findTestFiles server/tests/api/notifications)
-    searchFiles=$(findTestFiles server/tests/api/search)
+    checkParamFiles=$(findTestFiles ./dist/server/tests/api/check-params)
+    notificationsFiles=$(findTestFiles ./dist/server/tests/api/notifications)
+    searchFiles=$(findTestFiles ./dist/server/tests/api/search)
 
-    MOCHA_PARALLEL=true runTest 2 $notificationsFiles $searchFiles $checkParamFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
 
-    serverFiles=$(findTestFiles server/tests/api/server)
-    usersFiles=$(findTestFiles server/tests/api/users)
-    liveFiles=$(findTestFiles server/tests/api/live)
+    liveFiles=$(findTestFiles ./dist/server/tests/api/live)
+    serverFiles=$(findTestFiles ./dist/server/tests/api/server)
+    usersFiles=$(findTestFiles ./dist/server/tests/api/users)
 
-    MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles $liveFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $serverFiles $usersFiles $liveFiles
 elif [ "$1" = "api-3" ]; then
     npm run build:server
 
-    videosFiles=$(findTestFiles server/tests/api/videos)
+    videosFiles=$(findTestFiles ./dist/server/tests/api/videos)
 
-    MOCHA_PARALLEL=true runTest 2 $videosFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
-    activitypubFiles=$(findTestFiles server/tests/api/moderation)
-    redundancyFiles=$(findTestFiles server/tests/api/redundancy)
-    activitypubFiles=$(findTestFiles server/tests/api/activitypub)
+    moderationFiles=$(findTestFiles ./dist/server/tests/api/moderation)
+    redundancyFiles=$(findTestFiles ./dist/server/tests/api/redundancy)
+    activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
 
-    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest 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
 
-    externalPluginsFiles=$(findTestFiles server/tests/external-plugins)
+    externalPluginsFiles=$(findTestFiles ./dist/server/tests/external-plugins)
 
-    runTest 1 $externalPluginsFiles
+    runTest "$1" 1 $externalPluginsFiles
 elif [ "$1" = "lint" ]; then
-    npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
+    npm run eslint -- --ext .ts "./server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
     npm run swagger-cli -- validate support/doc/api/openapi.yaml
 
     ( cd client