Hello community,
here is the log from the commit of package grpc for openSUSE:Factory checked in
at 2018-01-17 21:57:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grpc (Old)
and /work/SRC/openSUSE:Factory/.grpc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grpc"
Wed Jan 17 21:57:32 2018 rev:3 rq:566379 version:1.8.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/grpc/grpc.changes 2018-01-13
21:46:06.178394932 +0100
+++ /work/SRC/openSUSE:Factory/.grpc.new/grpc.changes 2018-01-17
21:58:52.813613712 +0100
@@ -1,0 +2,7 @@
+Tue Jan 16 11:20:00 UTC 2018 - jeng...@inai.de
+
+- Update to new upstream release 1.8.4
+ * Fix HTTP/2 PING issues
+ * Fix issues with poll engine
+
+-------------------------------------------------------------------
Old:
----
v1.8.3.tar.gz
New:
----
v1.8.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grpc.spec ++++++
--- /var/tmp/diff_new_pack.hHfGaD/_old 2018-01-17 21:58:54.697525408 +0100
+++ /var/tmp/diff_new_pack.hHfGaD/_new 2018-01-17 21:58:54.701525220 +0100
@@ -16,9 +16,9 @@
#
-%define lname libgrpc-1_8_3
+%define lname libgrpc-1_8_4
Name: grpc
-Version: 1.8.3
+Version: 1.8.4
Release: 0
Summary: HTTP/2-based Remote Procedure Call implementation
License: Apache-2.0
++++++ v1.8.3.tar.gz -> v1.8.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/BUILD new/grpc-1.8.4/BUILD
--- old/grpc-1.8.3/BUILD 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/BUILD 2018-01-09 06:01:17.000000000 +0100
@@ -43,7 +43,7 @@
core_version = "5.0.0"
-version = "1.8.3"
+version = "1.8.4"
GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/CMakeLists.txt
new/grpc-1.8.4/CMakeLists.txt
--- old/grpc-1.8.3/CMakeLists.txt 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/CMakeLists.txt 2018-01-09 06:01:17.000000000 +0100
@@ -24,7 +24,7 @@
cmake_minimum_required(VERSION 2.8)
set(PACKAGE_NAME "grpc")
-set(PACKAGE_VERSION "1.8.3")
+set(PACKAGE_VERSION "1.8.4")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/";)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/Makefile new/grpc-1.8.4/Makefile
--- old/grpc-1.8.3/Makefile 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/Makefile 2018-01-09 06:01:17.000000000 +0100
@@ -412,8 +412,8 @@
endif
CORE_VERSION = 5.0.0
-CPP_VERSION = 1.8.3
-CSHARP_VERSION = 1.8.3
+CPP_VERSION = 1.8.4
+CSHARP_VERSION = 1.8.4
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/build.yaml new/grpc-1.8.4/build.yaml
--- old/grpc-1.8.3/build.yaml 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/build.yaml 2018-01-09 06:01:17.000000000 +0100
@@ -14,7 +14,7 @@
'#10': See the expand_version.py for all the quirks here
core_version: 5.0.0
g_stands_for: generous
- version: 1.8.3
+ version: 1.8.4
filegroups:
- name: census
public_headers:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/gRPC-Core.podspec
new/grpc-1.8.4/gRPC-Core.podspec
--- old/grpc-1.8.3/gRPC-Core.podspec 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/gRPC-Core.podspec 2018-01-09 06:01:17.000000000 +0100
@@ -22,7 +22,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
- version = '1.8.3'
+ version = '1.8.4'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/gRPC-ProtoRPC.podspec
new/grpc-1.8.4/gRPC-ProtoRPC.podspec
--- old/grpc-1.8.3/gRPC-ProtoRPC.podspec 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/gRPC-ProtoRPC.podspec 2018-01-09 06:01:17.000000000
+0100
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
- version = '1.8.3'
+ version = '1.8.4'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/gRPC-RxLibrary.podspec
new/grpc-1.8.4/gRPC-RxLibrary.podspec
--- old/grpc-1.8.3/gRPC-RxLibrary.podspec 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/gRPC-RxLibrary.podspec 2018-01-09 06:01:17.000000000
+0100
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
- version = '1.8.3'
+ version = '1.8.4'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/gRPC.podspec new/grpc-1.8.4/gRPC.podspec
--- old/grpc-1.8.3/gRPC.podspec 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/gRPC.podspec 2018-01-09 06:01:17.000000000 +0100
@@ -20,7 +20,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
- version = '1.8.3'
+ version = '1.8.4'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/package.xml new/grpc-1.8.4/package.xml
--- old/grpc-1.8.3/package.xml 2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/package.xml 2018-01-09 06:01:17.000000000 +0100
@@ -13,8 +13,8 @@
<date>2017-08-24</date>
<time>16:06:07</time>
<version>
- <release>1.8.3</release>
- <api>1.8.3</api>
+ <release>1.8.4</release>
+ <api>1.8.4</api>
</version>
<stability>
<release>beta</release>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
new/grpc-1.8.4/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
--- old/grpc-1.8.3/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
2018-01-09 06:01:17.000000000 +0100
@@ -549,6 +549,7 @@
/* No pings allowed before receiving a header or data frame. */
t->ping_state.pings_before_data_required = 0;
t->ping_state.is_delayed_ping_timer_set = false;
+ t->ping_state.last_ping_sent_time = GRPC_MILLIS_INF_PAST;
t->ping_recv_state.last_ping_recv_time = GRPC_MILLIS_INF_PAST;
t->ping_recv_state.ping_strikes = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/core/ext/transport/chttp2/transport/writing.cc
new/grpc-1.8.4/src/core/ext/transport/chttp2/transport/writing.cc
--- old/grpc-1.8.3/src/core/ext/transport/chttp2/transport/writing.cc
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/core/ext/transport/chttp2/transport/writing.cc
2018-01-09 06:01:17.000000000 +0100
@@ -69,20 +69,24 @@
return;
}
grpc_millis now = grpc_exec_ctx_now(exec_ctx);
+
+ grpc_millis next_allowed_ping_interval =
+ (t->keepalive_permit_without_calls == 0 &&
+ grpc_chttp2_stream_map_size(&t->stream_map) == 0)
+ ? 7200 * GPR_MS_PER_SEC
+ : t->ping_policy.min_sent_ping_interval_without_data;
grpc_millis next_allowed_ping =
- t->ping_state.last_ping_sent_time +
- t->ping_policy.min_sent_ping_interval_without_data;
- if (t->keepalive_permit_without_calls == 0 &&
- grpc_chttp2_stream_map_size(&t->stream_map) == 0) {
- next_allowed_ping =
- t->ping_recv_state.last_ping_recv_time + 7200 * GPR_MS_PER_SEC;
- }
+ t->ping_state.last_ping_sent_time + next_allowed_ping_interval;
+
if (next_allowed_ping > now) {
/* not enough elapsed time between successive pings */
if (grpc_http_trace.enabled() || grpc_bdp_estimator_trace.enabled()) {
gpr_log(GPR_DEBUG,
- "%s: Ping delayed [%p]: not enough time elapsed since last ping",
- t->is_client ? "CLIENT" : "SERVER", t->peer_string);
+ "%s: Ping delayed [%p]: not enough time elapsed since last ping.
"
+ " Last ping %f: Next ping %f: Now %f",
+ t->is_client ? "CLIENT" : "SERVER", t->peer_string,
+ (double)t->ping_state.last_ping_sent_time,
+ (double)next_allowed_ping, (double)now);
}
if (!t->ping_state.is_delayed_ping_timer_set) {
t->ping_state.is_delayed_ping_timer_set = true;
@@ -91,6 +95,7 @@
}
return;
}
+
pq->inflight_id = t->ping_ctr;
t->ping_ctr++;
GRPC_CLOSURE_LIST_SCHED(exec_ctx, &pq->lists[GRPC_CHTTP2_PCL_INITIATE]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/core/lib/iomgr/ev_poll_posix.cc
new/grpc-1.8.4/src/core/lib/iomgr/ev_poll_posix.cc
--- old/grpc-1.8.3/src/core/lib/iomgr/ev_poll_posix.cc 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/core/lib/iomgr/ev_poll_posix.cc 2018-01-09
06:01:17.000000000 +0100
@@ -473,7 +473,7 @@
static void notify_on_locked(grpc_exec_ctx* exec_ctx, grpc_fd* fd,
grpc_closure** st, grpc_closure* closure) {
- if (fd->shutdown) {
+ if (fd->shutdown || gpr_atm_no_barrier_load(&fd->pollhup)) {
GRPC_CLOSURE_SCHED(exec_ctx, closure,
GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown"));
} else if (*st == CLOSURE_NOT_READY) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/core/lib/iomgr/tcp_uv.cc
new/grpc-1.8.4/src/core/lib/iomgr/tcp_uv.cc
--- old/grpc-1.8.3/src/core/lib/iomgr/tcp_uv.cc 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/core/lib/iomgr/tcp_uv.cc 2018-01-09 06:01:17.000000000
+0100
@@ -65,6 +65,17 @@
grpc_pollset* pollset;
} grpc_tcp;
+static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) {
+ return grpc_error_set_str(
+ grpc_error_set_int(
+ src_error,
+ /* All tcp errors are marked with UNAVAILABLE so that application may
+ * choose to retry. */
+ GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE),
+ GRPC_ERROR_STR_TARGET_ADDRESS,
+ grpc_slice_from_copied_string(tcp->peer_string));
+}
+
static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) {
grpc_resource_user_unref(exec_ctx, tcp->resource_user);
gpr_free(tcp->handle);
@@ -166,7 +177,8 @@
// TODO(murgatroid99): figure out what the return value here means
uv_read_stop(stream);
if (nread == UV_EOF) {
- error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF");
+ error =
+ tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp);
grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices);
} else if (nread > 0) {
// Successful read
@@ -181,7 +193,8 @@
}
} else {
// nread < 0: Error
- error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed");
+ error = tcp_annotate_error(
+ GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed"), tcp);
grpc_slice_buffer_reset_and_unref_internal(&exec_ctx, tcp->read_slices);
}
call_read_cb(&exec_ctx, tcp, error);
@@ -200,7 +213,9 @@
status =
uv_read_start((uv_stream_t*)tcp->handle, alloc_uv_buf, read_callback);
if (status != 0) {
- error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed at start");
+ error = tcp_annotate_error(
+ GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Read failed at start"),
+ tcp);
error = grpc_error_set_str(
error, GRPC_ERROR_STR_OS_ERROR,
grpc_slice_from_static_string(uv_strerror(status)));
@@ -241,7 +256,8 @@
if (status == 0) {
error = GRPC_ERROR_NONE;
} else {
- error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Write failed");
+ error = tcp_annotate_error(
+ GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP Write failed"), tcp);
}
if (grpc_tcp_trace.enabled()) {
const char* str = grpc_error_string(error);
@@ -275,9 +291,10 @@
}
if (tcp->shutting_down) {
- GRPC_CLOSURE_SCHED(
- exec_ctx, cb,
- GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP socket is shutting down"));
+ GRPC_CLOSURE_SCHED(exec_ctx, cb,
+ tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+ "TCP socket is shutting down"),
+ tcp));
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/cpp/common/version_cc.cc
new/grpc-1.8.4/src/cpp/common/version_cc.cc
--- old/grpc-1.8.3/src/cpp/common/version_cc.cc 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/cpp/common/version_cc.cc 2018-01-09 06:01:17.000000000
+0100
@@ -22,5 +22,5 @@
#include <grpc++/grpc++.h>
namespace grpc {
-grpc::string Version() { return "1.8.3"; }
+grpc::string Version() { return "1.8.4"; }
} // namespace grpc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/csharp/Grpc.Core/Version.csproj.include
new/grpc-1.8.4/src/csharp/Grpc.Core/Version.csproj.include
--- old/grpc-1.8.3/src/csharp/Grpc.Core/Version.csproj.include 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/csharp/Grpc.Core/Version.csproj.include 2018-01-09
06:01:17.000000000 +0100
@@ -1,7 +1,7 @@
<!-- This file is generated -->
<Project>
<PropertyGroup>
- <GrpcCsharpVersion>1.8.3</GrpcCsharpVersion>
+ <GrpcCsharpVersion>1.8.4</GrpcCsharpVersion>
<GoogleProtobufVersion>3.3.0</GoogleProtobufVersion>
</PropertyGroup>
</Project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/csharp/Grpc.Core/VersionInfo.cs
new/grpc-1.8.4/src/csharp/Grpc.Core/VersionInfo.cs
--- old/grpc-1.8.3/src/csharp/Grpc.Core/VersionInfo.cs 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/csharp/Grpc.Core/VersionInfo.cs 2018-01-09
06:01:17.000000000 +0100
@@ -33,11 +33,11 @@
/// <summary>
/// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
/// </summary>
- public const string CurrentAssemblyFileVersion = "1.8.3.0";
+ public const string CurrentAssemblyFileVersion = "1.8.4.0";
/// <summary>
/// Current version of gRPC C#
/// </summary>
- public const string CurrentVersion = "1.8.3";
+ public const string CurrentVersion = "1.8.4";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/csharp/build_packages_dotnetcli.bat
new/grpc-1.8.4/src/csharp/build_packages_dotnetcli.bat
--- old/grpc-1.8.3/src/csharp/build_packages_dotnetcli.bat 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/csharp/build_packages_dotnetcli.bat 2018-01-09
06:01:17.000000000 +0100
@@ -13,7 +13,7 @@
@rem limitations under the License.
@rem Current package versions
-set VERSION=1.8.3
+set VERSION=1.8.4
@rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/csharp/build_packages_dotnetcli.sh
new/grpc-1.8.4/src/csharp/build_packages_dotnetcli.sh
--- old/grpc-1.8.3/src/csharp/build_packages_dotnetcli.sh 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/csharp/build_packages_dotnetcli.sh 2018-01-09
06:01:17.000000000 +0100
@@ -39,7 +39,7 @@
dotnet pack --configuration Release Grpc.HealthCheck --output
../../../artifacts
dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
-nuget pack Grpc.nuspec -Version "1.8.3" -OutputDirectory ../../artifacts
-nuget pack Grpc.Tools.nuspec -Version "1.8.3" -OutputDirectory ../../artifacts
+nuget pack Grpc.nuspec -Version "1.8.4" -OutputDirectory ../../artifacts
+nuget pack Grpc.Tools.nuspec -Version "1.8.4" -OutputDirectory ../../artifacts
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
new/grpc-1.8.4/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
--- old/grpc-1.8.3/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
2018-01-09 06:01:17.000000000 +0100
@@ -42,7 +42,7 @@
# exclamation mark ensures that other "regular" pods will be able to find it
as it'll be installed
# before them.
s.name = '!ProtoCompiler-gRPCPlugin'
- v = '1.8.3'
+ v = '1.8.4'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto
services.'
s.description = <<-DESC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/objective-c/GRPCClient/private/version.h
new/grpc-1.8.4/src/objective-c/GRPCClient/private/version.h
--- old/grpc-1.8.3/src/objective-c/GRPCClient/private/version.h 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/objective-c/GRPCClient/private/version.h 2018-01-09
06:01:17.000000000 +0100
@@ -23,4 +23,4 @@
// `tools/buildgen/generate_projects.sh`.
-#define GRPC_OBJC_VERSION_STRING @"1.8.3"
+#define GRPC_OBJC_VERSION_STRING @"1.8.4"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/objective-c/tests/version.h
new/grpc-1.8.4/src/objective-c/tests/version.h
--- old/grpc-1.8.3/src/objective-c/tests/version.h 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/objective-c/tests/version.h 2018-01-09
06:01:17.000000000 +0100
@@ -23,5 +23,5 @@
// `tools/buildgen/generate_projects.sh`.
-#define GRPC_OBJC_VERSION_STRING @"1.8.3"
+#define GRPC_OBJC_VERSION_STRING @"1.8.4"
#define GRPC_C_VERSION_STRING @"5.0.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/php/composer.json
new/grpc-1.8.4/src/php/composer.json
--- old/grpc-1.8.3/src/php/composer.json 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/php/composer.json 2018-01-09 06:01:17.000000000
+0100
@@ -2,7 +2,7 @@
"name": "grpc/grpc-dev",
"description": "gRPC library for PHP - for Developement use only",
"license": "Apache-2.0",
- "version": "1.8.3",
+ "version": "1.8.4",
"require": {
"php": ">=5.5.0",
"google/protobuf": "^v3.3.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/php/ext/grpc/version.h
new/grpc-1.8.4/src/php/ext/grpc/version.h
--- old/grpc-1.8.3/src/php/ext/grpc/version.h 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/php/ext/grpc/version.h 2018-01-09 06:01:17.000000000
+0100
@@ -20,6 +20,6 @@
#ifndef VERSION_H
#define VERSION_H
-#define PHP_GRPC_VERSION "1.8.3"
+#define PHP_GRPC_VERSION "1.8.4"
#endif /* VERSION_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/python/grpcio/grpc/_grpcio_metadata.py
new/grpc-1.8.4/src/python/grpcio/grpc/_grpcio_metadata.py
--- old/grpc-1.8.3/src/python/grpcio/grpc/_grpcio_metadata.py 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio/grpc/_grpcio_metadata.py 2018-01-09
06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
-__version__ = """1.8.3"""
+__version__ = """1.8.4"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/python/grpcio/grpc_version.py
new/grpc-1.8.4/src/python/grpcio/grpc_version.py
--- old/grpc-1.8.3/src/python/grpcio/grpc_version.py 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio/grpc_version.py 2018-01-09
06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/python/grpcio_health_checking/grpc_version.py
new/grpc-1.8.4/src/python/grpcio_health_checking/grpc_version.py
--- old/grpc-1.8.3/src/python/grpcio_health_checking/grpc_version.py
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio_health_checking/grpc_version.py
2018-01-09 06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/src/python/grpcio_reflection/grpc_version.py
new/grpc-1.8.4/src/python/grpcio_reflection/grpc_version.py
--- old/grpc-1.8.3/src/python/grpcio_reflection/grpc_version.py 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio_reflection/grpc_version.py 2018-01-09
06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/python/grpcio_testing/grpc_version.py
new/grpc-1.8.4/src/python/grpcio_testing/grpc_version.py
--- old/grpc-1.8.3/src/python/grpcio_testing/grpc_version.py 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio_testing/grpc_version.py 2018-01-09
06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/python/grpcio_tests/grpc_version.py
new/grpc-1.8.4/src/python/grpcio_tests/grpc_version.py
--- old/grpc-1.8.3/src/python/grpcio_tests/grpc_version.py 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/src/python/grpcio_tests/grpc_version.py 2018-01-09
06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/ruby/lib/grpc/version.rb
new/grpc-1.8.4/src/ruby/lib/grpc/version.rb
--- old/grpc-1.8.3/src/ruby/lib/grpc/version.rb 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/ruby/lib/grpc/version.rb 2018-01-09 06:01:17.000000000
+0100
@@ -14,5 +14,5 @@
# GRPC contains the General RPC module.
module GRPC
- VERSION = '1.8.3'
+ VERSION = '1.8.4'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/src/ruby/tools/version.rb
new/grpc-1.8.4/src/ruby/tools/version.rb
--- old/grpc-1.8.3/src/ruby/tools/version.rb 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/src/ruby/tools/version.rb 2018-01-09 06:01:17.000000000
+0100
@@ -14,6 +14,6 @@
module GRPC
module Tools
- VERSION = '1.8.3'
+ VERSION = '1.8.4'
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/test/distrib/ruby/distribtest.gemspec
new/grpc-1.8.4/test/distrib/ruby/distribtest.gemspec
--- old/grpc-1.8.3/test/distrib/ruby/distribtest.gemspec 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/test/distrib/ruby/distribtest.gemspec 2018-01-09
06:01:17.000000000 +0100
@@ -14,6 +14,8 @@
s.platform = Gem::Platform::RUBY
s.add_dependency 'grpc', '>=0'
+ s.add_dependency 'public_suffix', '< 3.0'
+ s.add_dependency 'jwt', '< 2.0'
s.add_development_dependency 'bundler', '~> 1.7'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/test/distrib/ruby/run_distrib_test.sh
new/grpc-1.8.4/test/distrib/ruby/run_distrib_test.sh
--- old/grpc-1.8.3/test/distrib/ruby/run_distrib_test.sh 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/test/distrib/ruby/run_distrib_test.sh 2018-01-09
06:01:17.000000000 +0100
@@ -17,10 +17,16 @@
cd $(dirname $0)
+ARCH=$1
+PLATFORM=$2
# Create an indexed local gem source with gRPC gems to test
GEM_SOURCE=../../../gem_source
mkdir -p ${GEM_SOURCE}/gems
-cp -r $EXTERNAL_GIT_ROOT/input_artifacts/*.gem ${GEM_SOURCE}/gems
+cp $EXTERNAL_GIT_ROOT/input_artifacts/grpc-*$ARCH-$PLATFORM.gem
${GEM_SOURCE}/gems
+if [[ "$(ls ${GEM_SOURCE}/gems | grep grpc | wc -l)" != 1 ]]; then
+ echo "Sanity check failed. Copied over more than one grpc gem into the gem
source directory."
+ exit 1
+fi;
gem install builder
gem generate_index --directory ${GEM_SOURCE}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/tools/distrib/python/grpcio_tools/grpc_version.py
new/grpc-1.8.4/tools/distrib/python/grpcio_tools/grpc_version.py
--- old/grpc-1.8.3/tools/distrib/python/grpcio_tools/grpc_version.py
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/tools/distrib/python/grpcio_tools/grpc_version.py
2018-01-09 06:01:17.000000000 +0100
@@ -14,4 +14,4 @@
# AUTO-GENERATED FROM
`$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
-VERSION='1.8.3'
+VERSION='1.8.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/tools/doxygen/Doxyfile.c++
new/grpc-1.8.4/tools/doxygen/Doxyfile.c++
--- old/grpc-1.8.3/tools/doxygen/Doxyfile.c++ 2017-12-31 21:38:59.000000000
+0100
+++ new/grpc-1.8.4/tools/doxygen/Doxyfile.c++ 2018-01-09 06:01:17.000000000
+0100
@@ -40,7 +40,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.8.3
+PROJECT_NUMBER = 1.8.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/grpc-1.8.3/tools/doxygen/Doxyfile.c++.internal
new/grpc-1.8.4/tools/doxygen/Doxyfile.c++.internal
--- old/grpc-1.8.3/tools/doxygen/Doxyfile.c++.internal 2017-12-31
21:38:59.000000000 +0100
+++ new/grpc-1.8.4/tools/doxygen/Doxyfile.c++.internal 2018-01-09
06:01:17.000000000 +0100
@@ -40,7 +40,7 @@
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.8.3
+PROJECT_NUMBER = 1.8.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/grpc-1.8.3/tools/run_tests/artifacts/distribtest_targets.py
new/grpc-1.8.4/tools/run_tests/artifacts/distribtest_targets.py
--- old/grpc-1.8.3/tools/run_tests/artifacts/distribtest_targets.py
2017-12-31 21:38:59.000000000 +0100
+++ new/grpc-1.8.4/tools/run_tests/artifacts/distribtest_targets.py
2018-01-09 06:01:17.000000000 +0100
@@ -163,6 +163,10 @@
return []
def build_jobspec(self):
+ arch_to_gem_arch = {
+ 'x64': 'x86_64',
+ 'x86': 'x86',
+ }
if not self.platform == 'linux':
raise Exception("Not supported yet.")
@@ -170,7 +174,8 @@
'tools/dockerfile/distribtest/ruby_%s_%s' % (
self.docker_suffix,
self.arch),
- 'test/distrib/ruby/run_distrib_test.sh',
+ 'test/distrib/ruby/run_distrib_test.sh %s %s' %
+ (arch_to_gem_arch[self.arch], self.platform),
copy_rel_path='test/distrib')
def __str__(self):
