diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-06-27 18:15:38 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-06-27 18:15:38 -0700 |
| commit | a6ce1ff1d6b451b0e747293a6d39bea4262492a8 (patch) | |
| tree | 7600aa7e0ae98961147159ebc15c26a79569f4a5 /tools/run_tests | |
| parent | 7ad758cd846bb6f15d3e655ce148ccc099a041e4 (diff) | |
Fix how npm is upgraded, add npm update line for electron
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/helper_scripts/build_node_electron.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/helper_scripts/pre_build_node.sh | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/run_tests/helper_scripts/build_node_electron.sh b/tools/run_tests/helper_scripts/build_node_electron.sh index ebcdceb0bf..424da2c6e3 100755 --- a/tools/run_tests/helper_scripts/build_node_electron.sh +++ b/tools/run_tests/helper_scripts/build_node_electron.sh @@ -28,4 +28,5 @@ export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_runtime=electron export npm_config_build_from_source=true mkdir -p ~/.electron-gyp +HOME=~/.electron-gyp npm update --prefer-online HOME=~/.electron-gyp npm install --unsafe-perm diff --git a/tools/run_tests/helper_scripts/pre_build_node.sh b/tools/run_tests/helper_scripts/pre_build_node.sh index f41da71d22..d4702b8705 100755 --- a/tools/run_tests/helper_scripts/pre_build_node.sh +++ b/tools/run_tests/helper_scripts/pre_build_node.sh @@ -20,9 +20,6 @@ source ~/.nvm/nvm.sh nvm install $NODE_VERSION set -ex -# Update npm to at least version 5 -npm update -g npm - export GRPC_CONFIG=${CONFIG:-opt} npm update --prefer-online |