[checkmk-commits] Try to fix build problems

Module: check_mk Branch: master Commit: 7076da3c2d9f507ce8e7150f0939d13a30796486 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7076da3c2d9f50… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 08:01:25 2019 +0100 Try to fix build problems Change-Id: Id884e7244eb400d502c978eb98aa385a3e0078b8 --- Makefile | 5 ++++- package-lock.json | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bb1c59d..c40f63d 100644 --- a/Makefile +++ b/Makefile @@ -311,8 +311,11 @@ optimize-images: echo "Missing pngcrush, not optimizing images! (run \"make setup\" to fix this)" ; \ fi +# TODO: The --unsafe-perms was added because the CI executes this as root during +# tests and building versions. Once we have the then build system this should not +# be necessary anymore. node_modules: package.json - npm install + npm install --unsafe-perms web/htdocs/js/%_min.js: node_modules webpack.config.js $(JAVASCRIPT_SOURCES) ENTERPRISE=$(ENTERPRISE) MANAGED=$(MANAGED) node_modules/.bin/webpack --mode=development diff --git a/package-lock.json b/package-lock.json index 2edbeba..6f08f2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3061,12 +3061,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3086,7 +3088,8 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", @@ -3234,6 +3237,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" }