Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / scripts / ci.sh

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 1819f73dd2e84cffba5116eea4d49ddeacaa34c6..aea009d9f48a795905006159b31d50326cee60da 100755 (executable)
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -9,9 +9,11 @@ fi
 
 killall -q peertube || true
 
+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
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/client.ts \
+    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 \
         server/tests/helpers/index.ts \
@@ -19,7 +21,7 @@ if [ "$1" = "misc" ]; then
 elif [ "$1" = "cli" ]; then
     npm run build:server
     CC=gcc-4.9 CXX=g++-4.9 npm run setup:cli
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
+    mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/cli/index.ts
 elif [ "$1" = "api-1" ]; then
     npm run build:server
     sh ./server/tests/api/ci-1.sh 2
@@ -33,9 +35,12 @@ 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
       npm run lint
     )
 fi
+
+git checkout -- config/test.yaml