aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xscripts/ci.sh3
-rw-r--r--server/tests/api/ci-4.sh4
-rw-r--r--tsconfig.json1
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh
index f75e457fd..f5bd0bdc9 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -13,7 +13,8 @@ perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: t
13 13
14if [ "$1" = "misc" ]; then 14if [ "$1" = "misc" ]; then
15 npm run build -- --light 15 npm run build -- --light
16 mocha --timeout 5000 --exit --require ts-node/register --files --require tsconfig-paths/register --bail server/tests/client.ts \ 16 TS_NODE_FILES=true mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
17 server/tests/client.ts \
17 server/tests/feeds/index.ts \ 18 server/tests/feeds/index.ts \
18 server/tests/misc-endpoints.ts \ 19 server/tests/misc-endpoints.ts \
19 server/tests/helpers/index.ts \ 20 server/tests/helpers/index.ts \
diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh
index e71b9b154..14a014f07 100644
--- a/server/tests/api/ci-4.sh
+++ b/server/tests/api/ci-4.sh
@@ -5,6 +5,6 @@ set -eu
5redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) 5redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo)
6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) 6activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo)
7 7
8MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ 8TS_NODE_FILES=true MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \
9 --require ts-node/register --files --require tsconfig-paths/register --bail \ 9 --require ts-node/register --require tsconfig-paths/register --bail \
10 $redundancyFiles $activitypubFiles 10 $redundancyFiles $activitypubFiles
diff --git a/tsconfig.json b/tsconfig.json
index aa129c1d9..d305722c4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,7 +28,6 @@
28 "@shared/*": [ "shared/*" ] 28 "@shared/*": [ "shared/*" ]
29 } 29 }
30 }, 30 },
31 "include": [ "." ],
32 "exclude": [ 31 "exclude": [
33 "server/tools/", 32 "server/tools/",
34 "node_modules", 33 "node_modules",