diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-07-05 10:26:56 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-05 10:26:56 -0700 |
| commit | e9089624fea55daca189787304a022086af3b55e (patch) | |
| tree | eea1815b70b3294285e51e4655373e5cfa866220 /tools/run_tests | |
| parent | be7f2a41ab2718b59e82e28913941aeec2f0bed2 (diff) | |
| parent | a6ce1ff1d6b451b0e747293a6d39bea4262492a8 (diff) | |
Merge pull request #11627 from murgatroid99/node_consistent_runtime_version
Make various scripts use the same version of Node
Diffstat (limited to 'tools/run_tests')
7 files changed, 7 insertions, 9 deletions
diff --git a/tools/run_tests/artifacts/build_artifact_node.sh b/tools/run_tests/artifacts/build_artifact_node.sh index 9d390831b8..581df721ae 100755 --- a/tools/run_tests/artifacts/build_artifact_node.sh +++ b/tools/run_tests/artifacts/build_artifact_node.sh @@ -16,7 +16,7 @@ NODE_TARGET_ARCH=$1 source ~/.nvm/nvm.sh -nvm use 4 +nvm use 8 set -ex cd $(dirname $0)/../../.. diff --git a/tools/run_tests/artifacts/build_package_node.sh b/tools/run_tests/artifacts/build_package_node.sh index 69cea3d137..2860f68bc4 100755 --- a/tools/run_tests/artifacts/build_package_node.sh +++ b/tools/run_tests/artifacts/build_package_node.sh @@ -15,7 +15,7 @@ source ~/.nvm/nvm.sh -nvm use 4 +nvm use 8 set -ex cd $(dirname $0)/../../.. 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 diff --git a/tools/run_tests/performance/run_worker_node.sh b/tools/run_tests/performance/run_worker_node.sh index 16c473ffda..1286c831fb 100755 --- a/tools/run_tests/performance/run_worker_node.sh +++ b/tools/run_tests/performance/run_worker_node.sh @@ -14,7 +14,7 @@ # limitations under the License. source ~/.nvm/nvm.sh -nvm use 7 +nvm use 8 set -ex |