grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #590 from nicolasnoble/upmerge-1.15-1.16 

Upmerge from 1.15 to 1.16
This commit is contained in:
Nicolas Noble 2018-10-24 15:24:22 -07:00 committed by GitHub
parent 0d1d1feb78 9e5ffb172d
commit 4863b70850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-native-core/build.yaml
View File

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

2
packages/grpc-native-core/src/server.js
View File

@ -52,7 +52,7 @@ function handleError(call, error) {
if (error.hasOwnProperty('message')) { if (error.hasOwnProperty('message')) {
status.details = error.message; status.details = error.message;
} }
if (error.hasOwnProperty('code')) { if (error.hasOwnProperty('code') && Number.isInteger(error.code)) {
status.code = error.code; status.code = error.code;
if (error.hasOwnProperty('details')) { if (error.hasOwnProperty('details')) {
status.details = error.details; status.details = error.details;

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

@ -16,7 +16,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
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 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
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm

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

@ -17,7 +17,7 @@ set -ex
arch_list=( ia32 x64 ) 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 )
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 ) 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 while true ; do
case $1 in case $1 in