Fix js build in drone

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-04-11 11:44:19 +02:00
parent 24f4f84eb6
commit 4f0c05f536
3 changed files with 7 additions and 5 deletions

View File

@@ -186,9 +186,7 @@ pipeline:
image: mhart/alpine-node:6.8.0 image: mhart/alpine-node:6.8.0
commands: commands:
- apk add --no-cache git - apk add --no-cache git
- cd js - make build-js
- npm install --deps
- ./node_modules/.bin/bower --allow-root install
when: when:
matrix: matrix:
TESTS: jsbuild TESTS: jsbuild

View File

@@ -1,6 +1,5 @@
root: true root: true
extends: extends:
- eslint:recommended - eslint:recommended
@@ -21,6 +20,9 @@ globals:
Clipboard: false Clipboard: false
oc_defaults: false oc_defaults: false
parserOptions:
ecmaVersion: 6
rules: rules:
curly: error curly: error
eqeqeq: ["error", "smart"] eqeqeq: ["error", "smart"]

View File

@@ -8,9 +8,11 @@ if [ -z "$ESLINT" ]; then
fi fi
echo Checking scripts with $ESLINT ... echo Checking scripts with $ESLINT ...
find -name "*.js" -not -path '*js/node_modules*' \ find -name "*.js" -path '*js/*' -not -path '*js/node_modules*' \
-not -path '*l10n/*' \ -not -path '*l10n/*' \
-not -path '*js/vendor*' \ -not -path '*js/vendor*' \
-not -path '*js/tests*' \ -not -path '*js/tests*' \
-not -path '*js/public*' \ -not -path '*js/public*' \
-not -path '*build/*' \
-not -path '*tests/*' \
-print0 | xargs -0 $ESLINT -print0 | xargs -0 $ESLINT