diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
tree | 6224f98ad30e99dc2d896423853892f2142f16ed /kokoro/release | |
parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'kokoro/release')
-rwxr-xr-x | kokoro/release/protoc/linux/build.sh | 36 | ||||
-rw-r--r-- | kokoro/release/protoc/linux/release.cfg | 7 |
2 files changed, 43 insertions, 0 deletions
diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh new file mode 100755 index 00000000..6c7049d7 --- /dev/null +++ b/kokoro/release/protoc/linux/build.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -x + +# Change to repo root. +cd $(dirname $0)/../../../.. + +# Initialize any submodules. +git submodule update --init --recursive + +# Generate the configure script. +./autogen.sh + +# Use docker image to build linux artifacts. +DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ") +docker pull $DOCKER_IMAGE_NAME + +docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \ + bash -l /var/local/protobuf/protoc-artifacts/build-protoc.sh \ + linux x86_64 protoc || { + echo "Failed to build protoc for linux + x86_64." + exit 1 +} + +docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \ + bash -l /var/local/protobuf/protoc-artifacts/build-protoc.sh \ + linux x86_32 protoc || { + echo "Failed to build protoc for linux + x86_32." + exit 1 +} + +# Cross-build for some architectures. +# TODO(xiaofeng): It currently fails with "machine `aarch64' not recognized" +# error. +# sudo apt install -y g++-aarch64-linux-gnu +# protoc-artifacts/build-protoc.sh linux aarch_64 protoc diff --git a/kokoro/release/protoc/linux/release.cfg b/kokoro/release/protoc/linux/release.cfg new file mode 100644 index 00000000..4d8b7b61 --- /dev/null +++ b/kokoro/release/protoc/linux/release.cfg @@ -0,0 +1,7 @@ +build_file: "protobuf/kokoro/release/protoc/linux/build.sh" + +action { + define_artifacts { + regex: "**/protoc.exe" + } +} |