Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

install.sh: add s390x to the install script #2070

Merged
merged 1 commit into from
Jan 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions hack/build-all.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down