From 0a50467db0eae864bfc25c83907fdacf7af7bc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sat, 24 Nov 2018 10:23:30 +0100
Subject: [PATCH] Update drone for vue build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .drone.yml    |  9 +++++----
 run-eslint.sh | 19 -------------------
 2 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100755 run-eslint.sh

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