Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport "Add Electron 7 and Node 13 to the build" to 1.24.x #1097

Merged
merged 6 commits into from Nov 1, 2019
Merged

Backport "Add Electron 7 and Node 13 to the build" to 1.24.x #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5e3638
Add Electron 7 to the build
murgatroid99 Oct 25, 2019
d85bec3
Also add Node 13 to the build
murgatroid99 Oct 25, 2019
028630a
Fix deprecated method use in call.cc
murgatroid99 Oct 25, 2019
433dab8
Update node-pre-gyp dependency to 0.14
murgatroid99 Oct 25, 2019
537ff90
Bump to 1.24.2
murgatroid99 Oct 31, 2019
6c41f6b
Bump to 1.24.2
murgatroid99 Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/grpc-native-core/binding.gyp
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=1',
'GRPC_UV',
'GRPC_NODE_VERSION="1.24.1"',
'GRPC_NODE_VERSION="1.24.2"',
'CARES_STATICLIB',
'CARES_SYMBOL_HIDING'
],
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/build.yaml
View file
Open in desktop
@@ -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.24.1
node_version: 1.24.2
4 changes: 2 additions & 2 deletions packages/grpc-native-core/ext/call.cc
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@ bool CreateMetadataArray(Local<Object> metadata_obj, grpc_metadata_array *array)
array->metadata = reinterpret_cast<grpc_metadata *>(
gpr_zalloc(array->capacity * sizeof(grpc_metadata)));
for (unsigned int i = 0; i < keys->Length(); i++) {
Local<String> current_key(Nan::To<String>(keys->Get(i)).ToLocalChecked());
Local<String> current_key(Nan::To<String>(Nan::Get(keys, i).ToLocalChecked()).ToLocalChecked());
Local<Array> values =
Local<Array>::Cast(Nan::Get(metadata, current_key).ToLocalChecked());
grpc_slice key_slice = CreateSliceFromString(current_key);
Expand Down Expand Up @@ -678,7 +678,7 @@ NAN_METHOD(Call::StartBatch) {
default:
return Nan::ThrowError("Argument object had an unrecognized key");
}
if (!op->ParseOp(obj->Get(type), &ops[i])) {
if (!op->ParseOp(Nan::Get(obj, type).ToLocalChecked(), &ops[i])) {
return Nan::ThrowTypeError("Incorrectly typed arguments to startBatch");
}
op_vector->push_back(std::move(op));
Expand Down
4 changes: 2 additions & 2 deletions packages/grpc-native-core/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.24.1",
"version": "1.24.2",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "https://grpc.io/",
Expand Down Expand Up @@ -33,7 +33,7 @@
"lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0",
"nan": "^2.13.2",
"node-pre-gyp": "^0.13.0",
"node-pre-gyp": "^0.14.0",
"protobufjs": "^5.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/templates/package.json.template
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
"lodash.camelcase": "^4.3.0",
"lodash.clone": "^4.5.0",
"nan": "^2.13.2",
"node-pre-gyp": "^0.13.0",
"node-pre-gyp": "^0.14.0",
"protobufjs": "^5.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@

set arch_list=ia32 x64

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 3.1.0 4.1.0 4.2.0 5.0.0 6.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 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0 7.0.0

set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm

Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
set -ex

arch_list=( ia32 x64 )
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 3.1.0 4.1.0 4.2.0 5.0.0 6.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 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0 7.0.0 )

umask 022

Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
View file
Open in desktop
Expand Up @@ -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 10.0.0 11.0.0 12.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 11.0.0 12.0.0 13.0.0

set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm

Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
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 10.0.0 11.0.0 12.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 11.0.0 12.0.0 13.0.0 )

while true ; do
case $1 in
Expand Down
2 changes: 1 addition & 1 deletion packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh
View file
Open in desktop
Expand Up @@ -26,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 10.0.0 11.0.0 12.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 11.0.0 12.0.0 13.0.0 )

for version in ${node_versions[@]}
do
Expand Down