Merge pull request #302 from nicolasnoble/node-10

Adding initial node 10 support.
grpc · May 2, 2018 · 4885390 · 4885390
2 parents 13afb85 + 30310d7
commit 4885390
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml
@@ -1,3 +1,3 @@
 settings:
   '#': It's possible to have node_version here as a key to override the core's version.
-  'node_version': 1.11.0
+  'node_version': 1.11.1
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",
@@ -30,7 +30,7 @@
   "dependencies": {
     "lodash": "^4.15.0",
     "nan": "^2.0.0",
-    "node-pre-gyp": "0.7.0",
+    "node-pre-gyp": "^0.10.0",
     "protobufjs": "^5.0.0"
   },
   "devDependencies": {

diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template
@@ -32,7 +32,7 @@
     "dependencies": {
       "lodash": "^4.15.0",
       "nan": "^2.0.0",
-      "node-pre-gyp": "0.7.0",
+      "node-pre-gyp": "^0.10.0",
       "protobufjs": "^5.0.0"
     },
     "devDependencies": {

diff --git a/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile b/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile
@@ -1,2 +1,2 @@
-FROM node:8-alpine
+FROM node:10-alpine
 RUN apk add --no-cache python curl bash build-base
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
@@ -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
+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 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
 

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
@@ -13,11 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 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 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.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 )
 
 while true ; do

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh
@@ -15,6 +15,9 @@
 
 set -ex
 
+# https://github.com/mapbox/node-pre-gyp/issues/362
+npm install -g node-gyp
+
 cd $(dirname $0)/../../..
 
 rm -rf build || true
@@ -23,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 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 )
 
 for version in ${node_versions[@]}
 do

diff --git a/tools/release/kokoro.bat b/tools/release/kokoro.bat
@@ -14,7 +14,13 @@
 
 @echo "Starting Windows build"
 
-@rem https://github.com/mapbox/node-pre-gyp/issues/362
+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
+
+call npm install -g npm
 call npm install -g node-gyp
 
 cd /d %~dp0

diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
@@ -13,7 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# https://github.com/mapbox/node-pre-gyp/issues/362
+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"
+
+nvm install 10
+nvm use 10
+npm install -g npm
 npm install -g node-gyp
 
 set -ex