From 7c59e343cd9d1f3f5577b5bfb71f6486beb4c006 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 10 Jan 2017 14:24:56 +0100 Subject: [PATCH] =?UTF-8?q?Bump=20version=20to=200.4.0=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And fix cross-binary script. Signed-off-by: Vincent Demeester --- hack/cross-binary | 5 ++++- version/version.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/cross-binary b/hack/cross-binary index d2f02d59b..bde94b0c9 100755 --- a/hack/cross-binary +++ b/hack/cross-binary @@ -18,6 +18,9 @@ fi # Get rid of existing binaries rm -f bundles/libcompose-cli* +BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') &> /dev/null +GITCOMMIT=$(git rev-parse --short HEAD) + # Build binaries for OS in ${OS_PLATFORM_ARG[@]}; do for ARCH in ${OS_ARCH_ARG[@]}; do @@ -33,7 +36,7 @@ for OS in ${OS_PLATFORM_ARG[@]}; do fi echo "Building binary for $OS/$ARCH..." GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 go build \ - -ldflags="-w -X github.com/docker/libcompose/version.GITCOMMIT=`git rev-parse --short HEAD`" \ + -ldflags="-w -X github.com/docker/libcompose/version.GITCOMMIT=${GITCOMMIT} -X github.com/docker/libcompose/version.BUILDTIME=${BUILDTIME} -X github.com/docker/libcompose/version.SHOWWARNING=${SHOWWARNING}" \ -o ${OUTPUT_BIN} ./cli/main done done diff --git a/version/version.go b/version/version.go index 820c98367..2d4593e92 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version var ( // VERSION should be updated by hand at each release - VERSION = "0.4.0-dev" + VERSION = "0.4.0" // GITCOMMIT will be overwritten automatically by the build system GITCOMMIT = "HEAD"