8000 Fix build-cli-bin by aliariff · Pull Request #4876 · linkerd/linkerd2 · GitHub
[go: up one dir, main page]
Skip to content

Fix build-cli-bin #4876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kleimkuhler merged 2 commits into from
Aug 13, 2020
Merged

Fix build-cli-bin #4876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1004339
Fix build-cli-bin
aliariff Aug 13, 2020
a90211b
Adjust indentation
aliariff Aug 13, 2020
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
26 changes: 26 additions & 0 deletions bin/build-cli-bin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,35 @@ rootdir=$( cd "$bindir"/.. && pwd )
# shellcheck source=_tag.sh
. "$bindir"/_tag.sh

arch=""
case $(uname) in
Darwin)
host_platform=darwin
;;
Linux)
host_platform=linux
arch=$(uname -m)
case $arch in
x86_64)
arch=amd64
;;
armv8*)
arch=arm64
;;
aarch64*)
arch=arm64
;;
armv*)
arch=arm
;;
amd64|arm64)
arch=$arch
;;
*)
echo "unsupported architecture: $arch" >&2
exit 1
;;
esac
;;
*)
host_platform=windows
Expand All @@ -27,6 +50,9 @@ esac
cd "$rootdir"
cd "$(pwd -P)"
target=target/cli/$host_platform/linkerd
if [ -n "$arch" ]; then
target=target/cli/$host_platform-$arch/linkerd
fi
GO111MODULE=on go generate -mod=readonly ./pkg/charts/static # TODO: `go generate` does not honor -mod=readonly
root_tag=$("$bindir"/root-tag)
GO111MODULE=on CGO_ENABLED=0 go build -o $target -tags prod -mod=readonly -ldflags "-s -w -X github.com/linkerd/linkerd2/pkg/version.Version=$root_tag" ./cli
Expand Down
0