Speedup CI

5 files changed, 19 insertions, 10 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1edde1ef..46b243244 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test_suite: [ misc, api-1, api-2, api-3, api-4, cli, lint, external-plugins ]
+        test_suite: [ client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ]
 
     env:
       PGUSER: peertube
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index 91147fc51..0b7cbec35 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -40,7 +40,7 @@ languages=(
 
 cd client
 
-rm -rf ./dist ./compiled
+rm -rf ./dist
 
 # Don't build other languages if --light arg is provided
 if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); then
diff --git a/scripts/ci.sh b/scripts/ci.sh
index b068deeb4..07e37e0ee 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -33,24 +33,33 @@ runTest () {
 }
 
 findTestFiles () {
-    find $1 -type f -name "*.js" | grep -v "/index.js" | 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" = "client" ]; then
     npm run build
 
     feedsFiles=$(findTestFiles ./dist/server/tests/feeds)
     helperFiles=$(findTestFiles ./dist/server/tests/helpers)
-    pluginsFiles=$(findTestFiles ./dist/server/tests/plugins)
     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 runTest "$1" 2 $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
 
+    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
diff --git a/scripts/test.sh b/scripts/test.sh
index 32034531d..01b259fe2 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -7,8 +7,8 @@ npm run setup:cli
 
 npm run ci -- lint
 
-npm run ci -- misc
-npm run ci -- cli
+npm run ci -- client
+npm run ci -- cli-plugin
 npm run ci -- api-1
 npm run ci -- api-2
 npm run ci -- api-3
diff --git a/server/tests/plugins/html-injection.ts b/server/tests/plugins/html-injection.ts
index 293c1df21..4fa8caa3a 100644
--- a/server/tests/plugins/html-injection.ts
+++ b/server/tests/plugins/html-injection.ts
@@ -15,7 +15,7 @@ import {
 
 const expect = chai.expect
 
-describe('Test plugins HTML inection', function () {
+describe('Test plugins HTML injection', function () {
   let server: ServerInfo = null
 
   before(async function () {