Merge pull request #270 from murgatroid99/nvm_upgrade_backport

Backport nvm changes to v1.11.x

install-nvm-windows.ps1

@@ -1,29 +0,0 @@
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# We're going to store nvm-windows in the .\nvm directory.
-$env:NVM_HOME = (Get-Item -Path ".\" -Verbose).FullName + "\nvm"
-
-# Switching to TLS/1.2 - see https://githubengineering.com/crypto-removal-notice/
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-# Downloading and unpacking nvm-windows
-Invoke-WebRequest -Uri https://github.com/coreybutler/nvm-windows/releases/download/1.1.5/nvm-noinstall.zip -OutFile nvm-noinstall.zip
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-[System.IO.Compression.ZipFile]::ExtractToDirectory("nvm-noinstall.zip", "nvm")
-
-$env:Path = $env:NVM_HOME + ";" + $env:Path
-Out-File -Encoding "OEM" nvm\settings.txt
-nvm root $env:NVM_HOME
-"%*" | Out-File -Encoding "OEM" nvm\elevate.cmd

run-tests.bat

@@ -15,27 +15,33 @@
 SET ROOT=%~dp0
 cd /d %~dp0
 
-PowerShell -Command .\install-nvm-windows.ps1
+powershell -c "Get-Host"
+powershell -c "$PSVersionTable"
+powershell -c "[System.Environment]::OSVersion"
+powershell -c "Get-WmiObject -Class Win32_ComputerSystem"
+powershell -c "(Get-WmiObject -Class Win32_ComputerSystem).SystemType"
 
-SET NVM_HOME=%ROOT%nvm
+powershell -c "& { iwr https://raw.githubusercontent.com/grumpycoders/nvm-ps/master/nvm.ps1 | iex }"
-SET NVM_SYMLINK=%ROOT%nvm\nodejs
+
-SET PATH=%NVM_HOME%;%NVM_SYMLINK%;%PATH%
+SET PATH=%APPDATA%\nvm-ps;%APPDATA%\nvm-ps\nodejs;%PATH%
 SET JOBS=8
 
-nvm version
+call nvm version
 
-nvm install 8.5.0
+call nvm install 8
-nvm use 8.5.0
+call nvm use 8
 
 call npm install || goto :error
 
 SET JUNIT_REPORT_STACK=1
 SET FAILED=0
 
-for %%v in (4.8.4 6.11.3 7.9.0 8.5.0) do (
+for %%v in (4 6 7 8 9) do (
-  nvm install %%v
+  call nvm install %%v
-  nvm use %%v
+  call nvm use %%v
   call npm install -g npm
+  @rem https://github.com/mapbox/node-pre-gyp/issues/362
+  call npm install -g node-gyp
   node -e "console.log(process.versions)"
 
   mkdir reports\node%%v

run-tests.sh

@@ -26,7 +26,7 @@ set -ex
 cd $ROOT
 
 if [ ! -n "$node_versions" ] ; then
-  node_versions="4 5 6 7 8"
+  node_versions="4 5 6 7 8 9"
 fi
 
 set +ex
@@ -51,6 +51,9 @@ do
   nvm use $version
   set -ex
 
+  # https://github.com/mapbox/node-pre-gyp/issues/362
+  npm install -g node-gyp
+
   mkdir -p "reports/node$version"
 
   node -e 'process.exit(process.version.startsWith("v'$version'") ? 0 : -1)'

tools/release/kokoro.bat

@@ -14,6 +14,9 @@
 
 @echo "Starting Windows build"
 
+@rem https://github.com/mapbox/node-pre-gyp/issues/362
+call npm install -g node-gyp
+
 cd /d %~dp0
 cd ..\..
 

tools/release/kokoro.sh

@@ -13,6 +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
+
 set -ex
 cd $(dirname $0)/../..
 base_dir=$(pwd)