From 594f423190d29a61dc81eb171213ff863dfa8473 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 1 Aug 2019 13:47:24 +0530 Subject: [PATCH 1/2] protobuf: Bump Protobuf version to 3.7.0 Bump Protobuf version to 3.7.0 Signed-off-by: Nitesh Konkar --- api/next.pb.txt | 1 + script/setup/install-protobuf | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/next.pb.txt b/api/next.pb.txt index 37ba19fa2..7a4280da2 100755 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -840,6 +840,7 @@ file { java_outer_classname: "FieldMaskProto" java_multiple_files: true go_package: "google.golang.org/genproto/protobuf/field_mask;field_mask" + cc_enable_arenas: true objc_class_prefix: "GPB" csharp_namespace: "Google.Protobuf.WellKnownTypes" } diff --git a/script/setup/install-protobuf b/script/setup/install-protobuf index ccb57bbbe..a002edfb6 100755 --- a/script/setup/install-protobuf +++ b/script/setup/install-protobuf @@ -20,7 +20,7 @@ # set -eu -o pipefail -PROTOBUF_VERSION=3.5.1 +PROTOBUF_VERSION=3.7.0 GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) PROTOBUF_DIR=$(mktemp -d) @@ -41,6 +41,10 @@ amd64|386) unzip $PROTOBUF_DIR/protobuf -d /usr/local ;; +ppc64le) + wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-linux-ppcle_64.zip" + unzip $PROTOBUF_DIR/protobuf -d /usr/local + ;; *) wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-cpp-$PROTOBUF_VERSION.zip" unzip $PROTOBUF_DIR/protobuf -d /usr/src/protobuf From d1b9ee543cd73b1c208829b771853ecd9d838cc7 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 25 Jul 2019 22:37:08 +0530 Subject: [PATCH 2/2] travis: Enable travis CI for ppc64le arch Enable travis CI for ppc64le arch Signed-off-by: Nitesh Konkar --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 435859dd9..2b36680b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,12 @@ services: language: go +os: +- linux +- linux-ppc64le + go: - "1.12.x" -os: - - "linux" - # TODO ppc64le is currently timing out on travis; see https://github.com/containerd/containerd/pull/2896 - # - "linux-ppc64le" matrix: include: @@ -41,6 +41,11 @@ env: - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 +matrix: + exclude: + - env: TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0 + os: linux-ppc64le + before_install: - uname -r