From a15871560f80e07386c1dabb8370cd2664ecfd1f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 16:56:52 +0100 Subject: Move to eslint --- scripts/ci.sh | 2 +- scripts/create-import-video-file-job.ts | 2 +- scripts/create-transcoding-job.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.sh b/scripts/ci.sh index 4063a6241..aea009d9f 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -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 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 () { } await JobQueue.Instance.init() - await JobQueue.Instance.createJob({ type: 'video-file-import', payload: dataInput }) + await JobQueue.Instance.createJobWithPromise({ type: 'video-file-import', payload: dataInput }) console.log('Import job for video %s created.', video.uuid) } 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 () { await JobQueue.Instance.init() for (const d of dataInput) { - await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: d }) + await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: d }) console.log('Transcoding job for video %s created.', video.uuid) } } -- cgit v1.2.3