aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2017-06-02 12:58:33 -0700
committerGravatar GitHub <noreply@github.com>2017-06-02 12:58:33 -0700
commit01b536c3e74609273ec4042ddb158be32c3fc6c7 (patch)
treea89cf8f2331b10b21de463b2cb27cc74bd1e6060
parentb3abfa6ac7bbe3e51d8a59d81e3e67c216d71339 (diff)
parente53730c3dccc218a889efb95b1326960fec5707f (diff)
Merge pull request #11388 from jtattermusch/kokoro_macos_install_fix
Fix macos installation script on Kokoro
-rw-r--r--tools/internal_ci/helper_scripts/prepare_build_macos_rc9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
index 2f97b0f705..3eccff80b4 100644
--- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc
+++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
@@ -56,9 +56,14 @@ sudo installer -pkg dotnet-dev-osx-x64.1.0.1.pkg -target /
ln -s /usr/local/share/dotnet/dotnet /usr/local/bin/dotnet
dotnet --version # bootstrap dotnet SDK
-# Node
+# nvm
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
-. ~/.nvm/nvm.sh
+# bootstrap nvm silently & without terminating this script
+set +ex
+source ~/.nvm/nvm.sh
+set -ex
+
+# node
nvm install 4
nvm alias default 4
npm update npm -g