Merge pull request grpc#222 from nicolasnoble/pre1

Creating a 1.10.1-pre1 release flag, and enabling us to generate out of band releases.
nicolasnoble · Mar 14, 2018 · cb6fe2e · cb6fe2e
2 parents dccc8b6 + adf8bf5
commit cb6fe2e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml
@@ -0,0 +1,3 @@
+settings:
+  '#': Temporary override; remove when unnecessary
+  node_version: 1.10.1-pre1
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.10.0",
+  "version": "1.10.1-pre1",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",

diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template
@@ -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/",

diff --git a/packages/grpc-native-core/tools/buildgen/generate_projects.sh b/packages/grpc-native-core/tools/buildgen/generate_projects.sh
@@ -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`