From 84d48a741544e17477f330772bd5b30cd46e2501 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 15 Aug 2019 14:30:20 -0700 Subject: [PATCH 1/2] Update version to 1.23.0 --- packages/grpc-native-core/binding.gyp | 2 +- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index d50231f9..f60a6b1e 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -97,7 +97,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=1', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.23.0-pre1"', + 'GRPC_NODE_VERSION="1.23.0"', 'CARES_STATICLIB', 'CARES_SYMBOL_HIDING' ], diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index ae91cd03..7c076491 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit ae91cd03818d6c4e7bc06efc261215338ce65475 +Subproject commit 7c0764918b9f33cab507ff483b4be849b0203ec4 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 39477913..e44b68b9 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.23.0-pre1", + "version": "1.23.0", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From 7c07d7615139413f34f8537ab934adceb7be8cd1 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 16 Aug 2019 13:02:59 -0700 Subject: [PATCH 2/2] Increase timeout for Windows Electron build --- test/kokoro/windows-build-electron.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/kokoro/windows-build-electron.cfg b/test/kokoro/windows-build-electron.cfg index 873b734a..7017d0ae 100644 --- a/test/kokoro/windows-build-electron.cfg +++ b/test/kokoro/windows-build-electron.cfg @@ -16,4 +16,4 @@ # Location of the continuous shell script in repository. build_file: "grpc-node/tools/release/kokoro-electron.bat" -timeout_mins: 60 +timeout_mins: 120