From 63e1c365a07bcad22b69e229bc03c033b4688b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 22 Jan 2021 18:38:46 +0100 Subject: [PATCH] Disable failing test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- 0001-Convert-int-to-string-using-rune.patch | 31 --------------------- golang-google-grpc.spec | 15 ++++++++-- 2 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 0001-Convert-int-to-string-using-rune.patch diff --git a/0001-Convert-int-to-string-using-rune.patch b/0001-Convert-int-to-string-using-rune.patch deleted file mode 100644 index 4e8ce25..0000000 --- a/0001-Convert-int-to-string-using-rune.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4ef7e90db5dbfb287dd3db7bf97e53f37e70f791 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Sun, 9 Aug 2020 18:48:59 +0200 -Subject: [PATCH] Convert int to string using rune() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -See https://github.com/golang/go/issues/32479 - -Signed-off-by: Robert-André Mauchin ---- - internal/transport/http_util_test.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/transport/http_util_test.go b/internal/transport/http_util_test.go -index 80b1c094..bcf70e42 100644 ---- a/internal/transport/http_util_test.go -+++ b/internal/transport/http_util_test.go -@@ -142,7 +142,7 @@ func (s) TestDecodeEncodeGrpcMessage(t *testing.T) { - } - } - --const binaryValue = string(128) -+const binaryValue = string(rune(128)) - - func (s) TestEncodeMetadataHeader(t *testing.T) { - for _, test := range []struct { --- -2.26.2 - diff --git a/golang-google-grpc.spec b/golang-google-grpc.spec index 1ad5fa9..eed4657 100644 --- a/golang-google-grpc.spec +++ b/golang-google-grpc.spec @@ -5,7 +5,7 @@ # https://github.com/grpc/grpc-go %global goipath google.golang.org/grpc %global forgeurl https://github.com/grpc/grpc-go -Version: 1.34.0 +Version: 1.35.0 %gometa @@ -53,6 +53,9 @@ BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/load BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type) BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/pkg/cache/types) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/pkg/cache/v3) +BuildRequires: golang(github.com/envoyproxy/go-control-plane/pkg/server/v3) BuildRequires: golang(github.com/golang/glog) BuildRequires: golang(github.com/golang/protobuf/jsonpb) BuildRequires: golang(github.com/golang/protobuf/proto) @@ -67,6 +70,7 @@ BuildRequires: golang(github.com/google/cel-go/checker/decls) BuildRequires: golang(github.com/google/cel-go/common/types) BuildRequires: golang(github.com/google/cel-go/interpreter) BuildRequires: golang(github.com/google/go-cmp/cmp) +BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(golang.org/x/net/http2) BuildRequires: golang(golang.org/x/net/http2/hpack) @@ -82,6 +86,7 @@ BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/errdetails) BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status) %endif BuildRequires: golang(google.golang.org/protobuf/compiler/protogen) +BuildRequires: golang(google.golang.org/protobuf/encoding/protojson) BuildRequires: golang(google.golang.org/protobuf/proto) BuildRequires: golang(google.golang.org/protobuf/reflect/protoreflect) BuildRequires: golang(google.golang.org/protobuf/runtime/protoiface) @@ -102,7 +107,6 @@ BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/config/liste BuildRequires: golang(github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3) BuildRequires: golang(github.com/golang/protobuf/ptypes/struct) BuildRequires: golang(github.com/google/cel-go/common/types/ref) -BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) %endif %endif @@ -122,13 +126,18 @@ cp %{S:1} %{S:2} . %if %{with check} %check # balancer/grpclb: needs network -%gocheck -d balancer/grpclb -d credentials/alts -d security/advancedtls +# credentials/tls/certprovider/pemfile: https://github.com/grpc/grpc-go/issues/4170 +%gocheck -d balancer/grpclb -d credentials/alts -d security/advancedtls -d credentials/tls/certprovider/pemfile %endif %endif %gopkgfiles %changelog +* Fri Jan 22 17:48:30 CET 2021 Robert-André Mauchin - 1.35.0-1 +- Update to 1.35.0 +- Close: rhbz#1915172 + * Wed Dec 23 09:07:13 CET 2020 Robert-André Mauchin - 1.34.0-1 - Update to 1.34.0 - Close: rhbz#1886969