From 6cb28887e6c2ce70d3c618b16e50fe3d24661041 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 2 Nov 2017 10:13:13 -0700 Subject: [PATCH] Update to 1.7.1, add Node 9 support, fix generated file permissions --- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 4 ++-- packages/grpc-native-core/templates/package.json.template | 2 +- .../tools/run_tests/artifacts/build_artifact_node.bat | 2 +- .../tools/run_tests/artifacts/build_artifact_node.sh | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index ed9929e24..279af9113 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit ed9929e2465f3a93d81ae45fa48ed2a82d63e831 +Subproject commit 279af9113481890bcc2c554c5d723c0b3c47f707 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 55f5294b8..f3fb57135 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.7.0", + "version": "1.7.1", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", @@ -31,7 +31,7 @@ "arguejs": "^0.2.3", "lodash": "^4.15.0", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.35", + "node-pre-gyp": "^0.6.39", "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 index a4eb88f7f..d8a5fb74b 100644 --- a/packages/grpc-native-core/templates/package.json.template +++ b/packages/grpc-native-core/templates/package.json.template @@ -33,7 +33,7 @@ "arguejs": "^0.2.3", "lodash": "^4.15.0", "nan": "^2.0.0", - "node-pre-gyp": "^0.6.35", + "node-pre-gyp": "^0.6.39", "protobufjs": "^5.0.0" }, "devDependencies": { 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 index 990ed7f48..9563da7db 100644 --- 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 @@ -12,7 +12,7 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. -set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 +set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.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 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 index 5669fe295..3b4d0456f 100755 --- 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 @@ -20,6 +20,8 @@ source ~/.nvm/nvm.sh nvm use 8 set -ex +umask 022 + cd $(dirname $0)/../../.. rm -rf build || true @@ -28,7 +30,7 @@ mkdir -p "${ARTIFACTS_OUT}" npm update -node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 ) +node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.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 )