cypress_test/Makefile.am | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a7da4096243b4f33102c05a83aaec63ec37bb069
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Sun Feb 23 11:46:17 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Feb 24 19:40:24 2020 +0100
cypress: make sure that npm packages are not installed more times.
When we build with more jobs.
Change-Id: I1051825ec8db4ccc7e10bd4a599480a97334538d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89373
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 48ec88ba4..ceadb62cb 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -5,6 +5,7 @@ CYPRESS_BINARY =
$(abs_builddir)/node_modules/cypress/bin/cypress
ESLINT_BINARY = $(abs_builddir)/node_modules/eslint/bin/eslint.js
WAIT_ON_BINARY = $(abs_builddir)/node_modules/wait-on/bin/wait-on
GET_PORT_BINARY = $(abs_builddir)/node_modules/get-port-cli/cli.js
+NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed
PID_FILE=$(abs_builddir)/loolwsd.pid
@@ -118,8 +119,12 @@ NODE_BINS = \
$(WAIT_ON_BINARY) \
$(GET_PORT_BINARY)
-$(NODE_BINS):
+$(NODE_BINS): $(NPM_INSTALLED);
+
+$(NPM_INSTALLED):
@npm install
+ @mkdir -p $(dir $(NPM_INSTALLED))
+ @touch $(NPM_INSTALLED)
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
