[whimsy] branch master updated: Try passing in the NPM path

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 4aeebfa4 Try passing in the NPM path
4aeebfa4 is described below

commit 4aeebfa41b72277f05400cd0f55fc1f7f5b27744
Author: Sebb <se...@apache.org>
AuthorDate: Thu Apr 7 14:45:32 2022 +0100

    Try passing in the NPM path
---
 .github/workflows/unittestagenda.yml | 2 +-
 www/board/agenda/Rakefile            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml
index ff92f172..0ae3ccdd 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -54,4 +54,4 @@ jobs:
         cd www/board/agenda
         bundle exec rake path
         echo '================'
-        SKIP_NAVIGATION=1 bundle exec rake
+        NPM_PATH=$(type npm) SKIP_NAVIGATION=1 bundle exec rake
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index 186a5b33..d55bbda9 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -60,7 +60,9 @@ file 'package-lock.json' => 'package.json' do
   sh 'type npm || true' # TEMP CHECK
   sh 'which -a npm || true' # TEMP CHECK
   sh 'echo $PATH' # TEMP CHECK
-  sh 'npm install'
+  npm = ENV['NPM_PATH']
+  puts npm
+  sh "#{npm} install"
   sh 'touch package-lock.json'
 end