From 0f643b33ed60c664ff41ddc60d2a6b319881f2a6 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Wed, 19 Dec 2018 08:13:43 -0800 Subject: [PATCH] install.sh: build s390x and include it in releases list Updates #2062. --- .travis.yml | 2 ++ hack/build-all.bash | 6 +++--- install.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c53c312359..bb7e0a6029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,8 @@ jobs: - release/dep-linux-ppc64.sha256 - release/dep-linux-ppc64le - release/dep-linux-ppc64le.sha256 + - release/dep-linux-s390x + - release/dep-linux-s390x.sha256 skip_cleanup: true on: repo: golang/dep diff --git a/hack/build-all.bash b/hack/build-all.bash index c1eff6c5d8..a71d258096 100755 --- a/hack/build-all.bash +++ b/hack/build-all.bash @@ -31,7 +31,7 @@ if [[ -z "${DEP_BUILD_PLATFORMS}" ]]; then fi if [[ -z "${DEP_BUILD_ARCHS}" ]]; then - DEP_BUILD_ARCHS="amd64 386 ppc64 ppc64le" + DEP_BUILD_ARCHS="amd64 386 ppc64 ppc64le s390x" fi mkdir -p "${DEP_ROOT}/release" @@ -50,8 +50,8 @@ for OS in ${DEP_BUILD_PLATFORMS[@]}; do else CGO_ENABLED=0 fi - if [[ "${ARCH}" == "ppc64" || "${ARCH}" == "ppc64le" ]] && [[ "${OS}" != "linux" ]]; then - # ppc64 and ppc64le are only supported on Linux. + if [[ "${ARCH}" == "ppc64" || "${ARCH}" == "ppc64le" || "${ARCH}" == "s390x" ]] && [[ "${OS}" != "linux" ]]; then + # ppc64, ppc64le, and s390x are only supported on Linux. echo "Building for ${OS}/${ARCH} not supported." else echo "Building for ${OS}/${ARCH} with CGO_ENABLED=${CGO_ENABLED}" diff --git a/install.sh b/install.sh index 6851ca1666..0c089a8e00 100755 --- a/install.sh +++ b/install.sh @@ -96,6 +96,7 @@ initArch() { i386) ARCH="386";; ppc64) ARCH="ppc64";; ppc64le) ARCH="ppc64le";; + s390x) ARCH="s390x";; *) echo "Architecture ${ARCH} is not supported by this installation script"; exit 1;; esac echo "ARCH = $ARCH"