Merge pull request #3272 from nitkon/patch-2

estesp · web-flow · commit 24e384805081 · 2019-08-05T15:51:08.000-04:00
travis: Enable travis CI for ppc64le arch
diff --git 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
 
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -840,6 +840,7 @@ file {`
`840`	`840`	`java_outer_classname: "FieldMaskProto"`
`841`	`841`	`java_multiple_files: true`
`842`	`842`	`go_package: "google.golang.org/genproto/protobuf/field_mask;field_mask"`
	`843`	`+ cc_enable_arenas: true`
`843`	`844`	`objc_class_prefix: "GPB"`
`844`	`845`	`csharp_namespace: "Google.Protobuf.WellKnownTypes"`
`845`	`846`	`}`