From 91018fc710681a842e6cd6cb97848279828959c7 Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 16 Oct 2023 08:31:36 -0700 Subject: [PATCH] build(base): Workaround nvm install issues https://github.com/nvm-sh/nvm/issues/1985#issuecomment-1764615912 --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 60ef06b0a..bfb39ac9a 100644 --- a/Makefile +++ b/Makefile @@ -466,8 +466,7 @@ clean: ./.env.~out~: ./.env.in $(call expand_template,$(<),$(@)) -./var/log/npm-install.log: ./package.json - $(MAKE) "./var/log/nvm-install.log" +./var/log/npm-install.log: ./package.json ./var/log/nvm-install.log mkdir -pv "$(dir $(@))" ~/.nvm/nvm-exec npm install | tee -a "$(@)" @@ -487,7 +486,7 @@ $(HOME)/.npmrc: $(MAKE) "$(HOME)/.nvm/nvm.sh" mkdir -pv "$(dir $(@))" set +x - . "$(HOME)/.nvm/nvm.sh" + . "$(HOME)/.nvm/nvm.sh" || true nvm install | tee -a "$(@)" # Manage JavaScript/TypeScript packages: