From 17ae86e9128c090b02494dd1ba10bdc41cd86936 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 10 Dec 2020 16:06:09 +0100
Subject: [PATCH] Display job log in ci

---
 scripts/ci.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index c6f5b8e77..84254cbc0 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -14,15 +14,25 @@ jobs=2
 
 runTest () {
     retries=3
+
+    jobname=$1
+    shift
+
     jobs=$1
     shift
+
     files=$@
 
     echo $files
 
-    parallel -t -j $jobs --retries $retries \
+    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 \
         ::: $files
+
+    cat "$joblog"
+    rm "$joblog"
 }
 
 findTestFiles () {
@@ -37,14 +47,14 @@ if [ "$1" = "misc" ]; then
     pluginsFiles=$(findTestFiles server/tests/plugins)
     miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
 
-    TS_NODE_FILES=true runTest 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
+    TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
 elif [ "$1" = "cli" ]; then
     npm run build:server
     npm run setup:cli
 
     cliFiles=$(findTestFiles server/tests/cli)
 
-    runTest 1 $cliFiles
+    runTest "$1" 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
 
@@ -52,7 +62,7 @@ elif [ "$1" = "api-1" ]; then
     notificationsFiles=$(findTestFiles server/tests/api/notifications)
     searchFiles=$(findTestFiles server/tests/api/search)
 
-    MOCHA_PARALLEL=true runTest 3 $notificationsFiles $searchFiles $checkParamFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
 
@@ -60,13 +70,13 @@ elif [ "$1" = "api-2" ]; then
     usersFiles=$(findTestFiles server/tests/api/users)
     liveFiles=$(findTestFiles server/tests/api/live)
 
-    MOCHA_PARALLEL=true runTest 3 $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)
 
-    MOCHA_PARALLEL=true runTest 3 $videosFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
@@ -74,13 +84,13 @@ elif [ "$1" = "api-4" ]; then
     redundancyFiles=$(findTestFiles server/tests/api/redundancy)
     activitypubFiles=$(findTestFiles 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 $activitypubFiles $redundancyFiles $activitypubFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 
     externalPluginsFiles=$(findTestFiles 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 swagger-cli -- validate support/doc/api/openapi.yaml