X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=5f1230d33c0f6752813ca4a82af50d10d54cf966;hb=7b51ede977c299a74728171d8c124bcc4cbba6ea;hp=f4a200a002bd62f043a4d001a7f067ec106ea4d9;hpb=8f608a4cb22ab232cfab20665050764b38bac9c7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index f4a200a00..5f1230d33 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -7,8 +7,6 @@ if [ $# -eq 0 ]; then
     exit -1
 fi
 
-killall -q peertube || true
-
 retries=3
 
 runTest () {
@@ -25,7 +23,7 @@ runTest () {
     joblog="$jobname-ci.log"
 
     parallel -j $jobs --retries $retries \
-        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail {}" \
+        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --bail {}" \
         ::: $files
 
     cat "$joblog" | uniq -c
@@ -33,63 +31,83 @@ runTest () {
 }
 
 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
+if [ "$1" = "types-package" ]; then
+    npm run generate-types-package 0.0.0
+    npm run tsc -- --noEmit --esModuleInterop packages/types/tests/test.ts
+elif [ "$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)
+    libFiles=$(findTestFiles ./dist/server/tests/lib)
+    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"
 
-    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
-elif [ "$1" = "cli" ]; then
+    MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
+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)
 
+    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 "$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 "$1" 3 $serverFiles $usersFiles $liveFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles
 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 "$1" 3 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
-    moderationFiles=$(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)
+    objectStorageFiles=$(findTestFiles ./dist/server/tests/api/object-storage)
+    activitypubFiles=$(findTestFiles ./dist/server/tests/api/activitypub)
+
+    MOCHA_PARALLEL=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles $objectStorageFiles
+elif [ "$1" = "api-5" ]; then
+    npm run build:server
+
+    transcodingFiles=$(findTestFiles ./dist/server/tests/api/transcoding)
 
-    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $moderationFiles $redundancyFiles $activitypubFiles
+    MOCHA_PARALLEL=true runTest "$1" 2 $transcodingFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 
-    externalPluginsFiles=$(findTestFiles server/tests/external-plugins)
+    externalPluginsFiles=$(findTestFiles ./dist/server/tests/external-plugins)
 
     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