From 08d462ab3702f06a0461b17dbc06a051ba486f18 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Wed, 26 May 2021 15:02:55 +0300 Subject: [PATCH] fix makefile parallel jobs (#2867) Signed-off-by: Jari Kolehmainen --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f4538b256c..fc764d0a94 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,13 @@ else DETECTED_OS := $(shell uname) endif -binaries/client: node_modules - yarn download-bins - node_modules: yarn.lock yarn install --frozen-lockfile --network-timeout=100000 yarn check --verify-tree --integrity +binaries/client: node_modules + yarn download-bins + static/build/LensDev.html: node_modules yarn compile:renderer @@ -51,11 +51,6 @@ test: binaries/client .PHONY: integration-linux integration-linux: binaries/client build-extension-types build-extensions -# ifdef XDF_CONFIG_HOME -# rm -rf ${XDG_CONFIG_HOME}/.config/Lens -# else -# rm -rf ${HOME}/.config/Lens -# endif yarn build:linux yarn integration @@ -81,7 +76,7 @@ else yarn run electron-builder --publish onTag endif -$(extension_node_modules): +$(extension_node_modules): node_modules cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund $(extension_dists): src/extensions/npm/extensions/dist @@ -102,7 +97,7 @@ copy-extension-themes: src/extensions/npm/extensions/__mocks__: cp -r __mocks__ src/extensions/npm/extensions/ -src/extensions/npm/extensions/dist: +src/extensions/npm/extensions/dist: node_modules yarn compile:extension-types .PHONY: build-npm