aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/helper_scripts
diff options
context:
space:
mode:
Diffstat (limited to 'tools/run_tests/helper_scripts')
-rwxr-xr-xtools/run_tests/helper_scripts/build_node_electron.sh3
-rwxr-xr-xtools/run_tests/helper_scripts/pre_build_node.sh3
-rwxr-xr-xtools/run_tests/helper_scripts/pre_build_node_electron.sh2
-rwxr-xr-xtools/run_tests/helper_scripts/run_node_electron.sh2
4 files changed, 4 insertions, 6 deletions
diff --git a/tools/run_tests/helper_scripts/build_node_electron.sh b/tools/run_tests/helper_scripts/build_node_electron.sh
index 5835235970..424da2c6e3 100755
--- a/tools/run_tests/helper_scripts/build_node_electron.sh
+++ b/tools/run_tests/helper_scripts/build_node_electron.sh
@@ -17,7 +17,7 @@
ELECTRON_VERSION=$1
source ~/.nvm/nvm.sh
-nvm use 6
+nvm use 8
set -ex
# change to grpc repo root
@@ -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
diff --git a/tools/run_tests/helper_scripts/pre_build_node_electron.sh b/tools/run_tests/helper_scripts/pre_build_node_electron.sh
index d42d70d214..29394d294f 100755
--- a/tools/run_tests/helper_scripts/pre_build_node_electron.sh
+++ b/tools/run_tests/helper_scripts/pre_build_node_electron.sh
@@ -16,7 +16,7 @@
ELECTRON_VERSION=$1
-nvm install 6
+nvm install 8
set -ex
npm install xvfb-maybe
diff --git a/tools/run_tests/helper_scripts/run_node_electron.sh b/tools/run_tests/helper_scripts/run_node_electron.sh
index 37d3fa0459..7d436b02cb 100755
--- a/tools/run_tests/helper_scripts/run_node_electron.sh
+++ b/tools/run_tests/helper_scripts/run_node_electron.sh
@@ -15,7 +15,7 @@
source ~/.nvm/nvm.sh
-nvm use 6
+nvm use 8
set -ex
# change to grpc repo root