diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
| commit | 8f608a4cb22ab232cfab20665050764b38bac9c7 (patch) | |
| tree | 6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /scripts/ci.sh | |
| parent | 030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff) | |
| parent | c215e627b575d2c4085ccb222f4ca8d0237b7552 (diff) | |
| download | PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip | |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'scripts/ci.sh')
| -rwxr-xr-x | scripts/ci.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh index a0de62d91..f4a200a00 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh | |||
| @@ -44,7 +44,7 @@ if [ "$1" = "misc" ]; then | |||
| 44 | pluginsFiles=$(findTestFiles server/tests/plugins) | 44 | pluginsFiles=$(findTestFiles server/tests/plugins) |
| 45 | miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts" | 45 | miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts" |
| 46 | 46 | ||
| 47 | TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles | 47 | MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles |
| 48 | elif [ "$1" = "cli" ]; then | 48 | elif [ "$1" = "cli" ]; then |
| 49 | npm run build:server | 49 | npm run build:server |
| 50 | npm run setup:cli | 50 | npm run setup:cli |