diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /scripts/travis.sh | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'scripts/travis.sh')
| -rwxr-xr-x | scripts/travis.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 5d195f902..509b40d87 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh | |||
| @@ -11,23 +11,25 @@ killall -q peertube || true | |||
| 11 | 11 | ||
| 12 | if [ "$1" = "misc" ]; then | 12 | if [ "$1" = "misc" ]; then |
| 13 | npm run build -- --light-fr | 13 | npm run build -- --light-fr |
| 14 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \ | 14 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/client.ts \ |
| 15 | server/tests/feeds/index.ts server/tests/misc-endpoints.ts | 15 | server/tests/feeds/index.ts \ |
| 16 | elif [ "$1" = "api" ]; then | 16 | server/tests/misc-endpoints.ts \ |
| 17 | npm run build:server | 17 | server/tests/helpers/index.ts |
| 18 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index.ts | ||
| 19 | elif [ "$1" = "cli" ]; then | 18 | elif [ "$1" = "cli" ]; then |
| 20 | npm run build:server | 19 | npm run build:server |
| 21 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/cli/index.ts | 20 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts |
| 22 | elif [ "$1" = "api-1" ]; then | 21 | elif [ "$1" = "api-1" ]; then |
| 23 | npm run build:server | 22 | npm run build:server |
| 24 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-1.ts | 23 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-1.ts |
| 25 | elif [ "$1" = "api-2" ]; then | 24 | elif [ "$1" = "api-2" ]; then |
| 26 | npm run build:server | 25 | npm run build:server |
| 27 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-2.ts | 26 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-2.ts |
| 28 | elif [ "$1" = "api-3" ]; then | 27 | elif [ "$1" = "api-3" ]; then |
| 29 | npm run build:server | 28 | npm run build:server |
| 30 | mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts | 29 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-3.ts |
| 30 | elif [ "$1" = "api-4" ]; then | ||
| 31 | npm run build:server | ||
| 32 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-4.ts | ||
| 31 | elif [ "$1" = "lint" ]; then | 33 | elif [ "$1" = "lint" ]; then |
| 32 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" | 34 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" |
| 33 | 35 | ||