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

This commit is contained in:
Nicolas "Pixel" Noble 2018-03-15 01:42:49 +01:00
commit 00933b29d0
4 changed files with 6 additions and 4 deletions

View File

@ -0,0 +1,2 @@
settings:
'#': It's possible to have node_version here as a key to override the core's version.

View File

@ -30,7 +30,7 @@
"dependencies": {
"lodash": "^4.15.0",
"nan": "^2.0.0",
"node-pre-gyp": "^0.6.39",
"node-pre-gyp": "^0.9.0",
"protobufjs": "^5.0.0"
},
"devDependencies": {

View File

@ -2,7 +2,7 @@
--- |
{
"name": "grpc",
"version": "${settings.version}",
"version": "${settings.get('node_version', settings.version)}",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",
@ -32,7 +32,7 @@
"dependencies": {
"lodash": "^4.15.0",
"nan": "^2.0.0",
"node-pre-gyp": "^0.6.39",
"node-pre-gyp": "^0.9.0",
"protobufjs": "^5.0.0"
},
"devDependencies": {

View File

@ -18,4 +18,4 @@ set -e
cd `dirname $0`/../..
root=`pwd`
./deps/grpc/tools/buildgen/generate_projects.sh --base=$root --templates `find templates -type f`
./deps/grpc/tools/buildgen/generate_projects.sh $root/build.yaml --base=$root --templates `find templates -type f`