From 5f47953c88ac9671e5e474630b640cf56b28b587 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Wed, 2 May 2018 01:20:08 +0200
Subject: [PATCH] Installing nvm from kokoro scripts.

---
 .../tools/run_tests/artifacts/build_artifact_node.bat        | 4 ----
 tools/release/kokoro.bat                                     | 5 +++--
 tools/release/kokoro.sh                                      | 5 +++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
index 442b2b04..2c4ee6f3 100644
--- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
+++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
@@ -12,10 +12,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
-powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }"
-
-SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH%
-
 call nvm install 10
 call nvm use 10
 
diff --git a/tools/release/kokoro.bat b/tools/release/kokoro.bat
index 1fde63b5..c55ddbf3 100644
--- a/tools/release/kokoro.bat
+++ b/tools/release/kokoro.bat
@@ -14,8 +14,9 @@
 
 @echo "Starting Windows build"
 
-@rem https://github.com/mapbox/node-pre-gyp/issues/362
-call npm install -g node-gyp
+powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }"
+
+SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH%
 
 cd /d %~dp0
 cd ..\..
diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
index b89504a9..37e61ea7 100755
--- a/tools/release/kokoro.sh
+++ b/tools/release/kokoro.sh
@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# https://github.com/mapbox/node-pre-gyp/issues/362
-npm install -g node-gyp
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 
 set -ex
 cd $(dirname $0)/../..