forks/peertube
1
0
Fork 0
Code Releases Activity

Speedup CI

Browse source
This commit is contained in:
Chocobozzz 2021-06-17 10:43:34 +02:00
parent 609a444202
commit 29b7426c67
No known key found for this signature in database
GPG key ID: 583A612D890159BE
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: 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: env:
PGUSER: peertube PGUSER: peertube

2
scripts/build/client.sh
View file

@ -40,7 +40,7 @@ languages=(
cd client cd client
rm -rf ./dist ./compiled rm -rf ./dist
# Don't build other languages if --light arg is provided # Don't build other languages if --light arg is provided
if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); then if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); then

19
scripts/ci.sh
View file

@ -33,24 +33,33 @@ runTest () {
} }
findTestFiles () { 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 npm run build
feedsFiles=$(findTestFiles ./dist/server/tests/feeds) feedsFiles=$(findTestFiles ./dist/server/tests/feeds)
helperFiles=$(findTestFiles ./dist/server/tests/helpers) helperFiles=$(findTestFiles ./dist/server/tests/helpers)
pluginsFiles=$(findTestFiles ./dist/server/tests/plugins)
miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js" 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 MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles
elif [ "$1" = "cli" ]; then elif [ "$1" = "cli-plugin" ]; then
npm run build:server npm run build:server
npm run setup:cli npm run setup:cli
pluginsFiles=$(findTestFiles ./dist/server/tests/plugins html-injection.js)
cliFiles=$(findTestFiles ./dist/server/tests/cli) cliFiles=$(findTestFiles ./dist/server/tests/cli)
MOCHA_PARALLEL=true runTest "$1" 2 $pluginsFiles
runTest "$1" 1 $cliFiles runTest "$1" 1 $cliFiles
elif [ "$1" = "api-1" ]; then elif [ "$1" = "api-1" ]; then
npm run build:server npm run build:server

4
scripts/test.sh
View file

@ -7,8 +7,8 @@ npm run setup:cli
npm run ci -- lint npm run ci -- lint
npm run ci -- misc npm run ci -- client
npm run ci -- cli npm run ci -- cli-plugin
npm run ci -- api-1 npm run ci -- api-1
npm run ci -- api-2 npm run ci -- api-2
npm run ci -- api-3 npm run ci -- api-3

2
server/tests/plugins/html-injection.ts
View file

@ -15,7 +15,7 @@ import {
const expect = chai.expect const expect = chai.expect
describe('Test plugins HTML inection', function () { describe('Test plugins HTML injection', function () {
let server: ServerInfo = null let server: ServerInfo = null
before(async function () { before(async function () {