aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-24 17:42:35 +0200
committerChocobozzz <chocobozzz@cpy.re>2019-05-27 14:56:06 +0200
commit46b2cec73c3ee10fe9f751a301e4afff0a56b371 (patch)
treec1d90513b346c67d83ae7cd8c80ab5cd0af79e78 /scripts
parent7e9d3f259d5dac0d17ca4f3d6844e8cfbb7e33d1 (diff)
downloadPeerTube-46b2cec73c3ee10fe9f751a301e4afff0a56b371.tar.gz
PeerTube-46b2cec73c3ee10fe9f751a301e4afff0a56b371.tar.zst
PeerTube-46b2cec73c3ee10fe9f751a301e4afff0a56b371.zip
Remove summon install
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/setup/cli.sh2
-rwxr-xr-xscripts/travis.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/setup/cli.sh b/scripts/setup/cli.sh
index 94ca3c441..9808868d3 100755
--- a/scripts/setup/cli.sh
+++ b/scripts/setup/cli.sh
@@ -13,4 +13,4 @@ rm -rf ./dist/server/tools/
13 13
14npm run tsc -- --build ./server/tools/tsconfig.json 14npm run tsc -- --build ./server/tools/tsconfig.json
15 15
16cp -r "./server/tools/node_modules" "./dist/server/tools" 16mv "./server/tools/node_modules" "./dist/server/tools"
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 454ac5e14..664d9fd6c 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -17,6 +17,7 @@ if [ "$1" = "misc" ]; then
17 server/tests/helpers/index.ts 17 server/tests/helpers/index.ts
18elif [ "$1" = "cli" ]; then 18elif [ "$1" = "cli" ]; then
19 npm run build:server 19 npm run build:server
20 CC=gcc-4.9 CXX=g++-4.9 npm run setup:cli
20 mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts 21 mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
21elif [ "$1" = "api-1" ]; then 22elif [ "$1" = "api-1" ]; then
22 npm run build:server 23 npm run build:server
@@ -28,8 +29,7 @@ elif [ "$1" = "api-3" ]; then
28 npm run build:server 29 npm run build:server
29 sh ./server/tests/api/travis-3.sh 2 30 sh ./server/tests/api/travis-3.sh 2
30elif [ "$1" = "api-4" ]; then 31elif [ "$1" = "api-4" ]; then
31 npm run setup:cli 32 npm run build:server
32 npm run build-server
33 sh ./server/tests/api/travis-4.sh 2 33 sh ./server/tests/api/travis-4.sh 2
34elif [ "$1" = "lint" ]; then 34elif [ "$1" = "lint" ]; then
35 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" 35 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"