diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/ci.sh | 4 | ||||
-rw-r--r-- | scripts/create-import-video-file-job.ts | 2 | ||||
-rwxr-xr-x | scripts/create-transcoding-job.ts | 2 | ||||
-rwxr-xr-x | scripts/dev/index.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh index d111b7447..aea009d9f 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh | |||
@@ -12,7 +12,7 @@ killall -q peertube || true | |||
12 | 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 | 12 | 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 |
13 | 13 | ||
14 | if [ "$1" = "misc" ]; then | 14 | if [ "$1" = "misc" ]; then |
15 | npm run build -- --light-fr | 15 | npm run build -- --light |
16 | mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \ | 16 | mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \ |
17 | server/tests/feeds/index.ts \ | 17 | server/tests/feeds/index.ts \ |
18 | server/tests/misc-endpoints.ts \ | 18 | server/tests/misc-endpoints.ts \ |
@@ -35,7 +35,7 @@ elif [ "$1" = "api-4" ]; then | |||
35 | npm run build:server | 35 | npm run build:server |
36 | sh ./server/tests/api/ci-4.sh 2 | 36 | sh ./server/tests/api/ci-4.sh 2 |
37 | elif [ "$1" = "lint" ]; then | 37 | elif [ "$1" = "lint" ]; then |
38 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" | 38 | npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" |
39 | npm run swagger-cli -- validate support/doc/api/openapi.yaml | 39 | npm run swagger-cli -- validate support/doc/api/openapi.yaml |
40 | 40 | ||
41 | ( cd client | 41 | ( cd client |
diff --git a/scripts/create-import-video-file-job.ts b/scripts/create-import-video-file-job.ts index 204337d55..37738ca40 100644 --- a/scripts/create-import-video-file-job.ts +++ b/scripts/create-import-video-file-job.ts | |||
@@ -38,6 +38,6 @@ async function run () { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | await JobQueue.Instance.init() | 40 | await JobQueue.Instance.init() |
41 | await JobQueue.Instance.createJob({ type: 'video-file-import', payload: dataInput }) | 41 | await JobQueue.Instance.createJobWithPromise({ type: 'video-file-import', payload: dataInput }) |
42 | console.log('Import job for video %s created.', video.uuid) | 42 | console.log('Import job for video %s created.', video.uuid) |
43 | } | 43 | } |
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts index 27170299d..fec58da2e 100755 --- a/scripts/create-transcoding-job.ts +++ b/scripts/create-transcoding-job.ts | |||
@@ -72,7 +72,7 @@ async function run () { | |||
72 | await JobQueue.Instance.init() | 72 | await JobQueue.Instance.init() |
73 | 73 | ||
74 | for (const d of dataInput) { | 74 | for (const d of dataInput) { |
75 | await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: d }) | 75 | await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: d }) |
76 | console.log('Transcoding job for video %s created.', video.uuid) | 76 | console.log('Transcoding job for video %s created.', video.uuid) |
77 | } | 77 | } |
78 | } | 78 | } |
diff --git a/scripts/dev/index.sh b/scripts/dev/index.sh index d221d2fc8..9e89516b8 100755 --- a/scripts/dev/index.sh +++ b/scripts/dev/index.sh | |||
@@ -3,5 +3,5 @@ | |||
3 | set -eu | 3 | set -eu |
4 | 4 | ||
5 | NODE_ENV=test npm run concurrently -- -k \ | 5 | NODE_ENV=test npm run concurrently -- -k \ |
6 | "npm run dev:client -- --skip-server" \ | 6 | "sh scripts/dev/client.sh --skip-server" \ |
7 | "npm run dev:server" | 7 | "sh scripts/dev/server.sh" |