X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fci.sh;h=aea009d9f48a795905006159b31d50326cee60da;hb=f409f0c3b91d85c66b4841d72ea65b5fbe1483d8;hp=9ff640c8e7ff35e9b9781aa27567491bad4bda73;hpb=c76130067cb8718bbbe863b672c89a9d22c4a0b3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/scripts/ci.sh b/scripts/ci.sh index 9ff640c8e..aea009d9f 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -9,10 +9,10 @@ fi killall -q peertube || true -perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "'"$PROXY_URL"'"#' config/test.yaml +perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "http://188.165.225.149:7899"#' config/test.yaml if [ "$1" = "misc" ]; then - npm run build -- --light-fr + npm run build -- --light mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \ server/tests/feeds/index.ts \ server/tests/misc-endpoints.ts \ @@ -35,7 +35,7 @@ elif [ "$1" = "api-4" ]; then npm run build:server sh ./server/tests/api/ci-4.sh 2 elif [ "$1" = "lint" ]; then - npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" + npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" npm run swagger-cli -- validate support/doc/api/openapi.yaml ( cd client