Merge branch 'grpc@1.16.x' of https://github.com/grpc/grpc-node into upmerge

.travis.yml

@@ -1,21 +0,0 @@
-language: node_js
-node_js:
-  - "4"
-  - "5"
-  - "6"
-  - "7"
-  - "8"
-  - "node"
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-install:
-  - npm install
-  - gulp setup
-script:
-  - gulp native.test

packages/grpc-native-core/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "lodash": "^4.17.5",
     "nan": "^2.0.0",
-    "node-pre-gyp": "^0.10.0",
+    "node-pre-gyp": "^0.12.0",
     "protobufjs": "^5.0.3"
   },
   "devDependencies": {

packages/grpc-native-core/templates/package.json.template

@@ -33,7 +33,7 @@
     "dependencies": {
       "lodash": "^4.17.5",
       "nan": "^2.0.0",
-      "node-pre-gyp": "^0.10.0",
+      "node-pre-gyp": "^0.12.0",
       "protobufjs": "^5.0.3"
     },
     "devDependencies": {

packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat

@@ -14,7 +14,7 @@
 
 set arch_list=ia32 x64
 
-set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0
+set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0
 
 set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0
 
@@ -38,12 +38,14 @@ for %%a in (%arch_list%) do (
     call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%%v --target_arch=%%a || goto :error
 
     xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error
+    rmdir build /S /Q
   )
 
   for %%v in (%electron_versions%) do (
     cmd /V /C "set "HOME=%USERPROFILE%\electron-gyp" && call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package --runtime=electron --target=%%v --target_arch=%%a --disturl=https://atom.io/download/electron" || goto :error
 
     xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error
+    rmdir build /S /Q
   )
 )
 if %errorlevel% neq 0 exit /b %errorlevel%

packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh

@@ -16,7 +16,7 @@
 set -ex
 
 arch_list=( ia32 x64 )
-node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 )
 electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 )
 
 while true ; do

packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh

@@ -26,7 +26,7 @@ mkdir -p "${ARTIFACTS_OUT}"
 
 npm update
 
-node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 )
 
 for version in ${node_versions[@]}
 do

run-tests.bat

@@ -38,7 +38,7 @@ call npm install || goto :error
 SET JUNIT_REPORT_STACK=1
 SET FAILED=0
 
-for %%v in (4 6 7 8 9 10) do (
+for %%v in (4 6 7 8 9 10 11) do (
   call nvm install %%v
   call nvm use %%v
   if "%%v"=="4" (

run-tests.sh

@@ -26,7 +26,7 @@ set -ex
 cd $ROOT
 
 if [ ! -n "$node_versions" ] ; then
-  node_versions="4 5 6 7 8 9 10"
+  node_versions="4 5 6 7 8 9 10 11"
 fi
 
 set +ex