diff --git a/.drone.yml b/.drone.yml index 17215f715..122ed29d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -219,15 +219,16 @@ pipeline: eslint: image: nextcloudci/eslint:eslint-1 commands: - - ./run-eslint.sh + - npm install + - npm run lint when: matrix: TESTS: eslint jsbuild: - image: mhart/alpine-node:6.8.0 + image: node:11-alpine commands: - - apk add --no-cache make - - make build-js + - npm install + - npm run build when: matrix: TESTS: jsbuild diff --git a/run-eslint.sh b/run-eslint.sh deleted file mode 100755 index 18f757737..000000000 --- a/run-eslint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -ESLINT=$(which eslint || true) -if [ -z "$ESLINT" ]; then - echo "Can't find command \"eslint\" in $PATH" - exit 1 -fi - -echo Checking scripts with $ESLINT ... -find -name "*.js" -path '*js/*' -not -path '*js/node_modules*' \ - -not -path '*l10n/*' \ - -not -path '*js/vendor*' \ - -not -path '*js/tests*' \ - -not -path '*js/webpack*' \ - -not -path '*js/public*' \ - -not -path '*build/*' \ - -not -path '*tests/*' \ - -print0 | xargs -0 $ESLINT