From 6c8bd560076526d92fd303acfefe0c5b550885ff Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 2 Dec 2016 19:56:27 +0100 Subject: [PATCH] hack/make.sh: fix BUILDTIME Signed-off-by: Antonio Murdaca (cherry picked from commit 7b1f77dcbc4c7cda754613f424f937056d3206ec) Signed-off-by: Victor Vieux --- hack/make.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index aaf181291d..f0e482feda 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -69,6 +69,7 @@ DEFAULT_BUNDLES=( ) VERSION=$(< ./VERSION) +! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then GITCOMMIT=$(git rev-parse --short HEAD) if [ -n "$(git status --porcelain --untracked-files=no)" ]; then @@ -82,11 +83,6 @@ if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; the git status --porcelain --untracked-files=no echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" fi - ! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null - if [ -z $BUILDTIME ]; then - # If using bash 3.1 which doesn't support --rfc-3389, eg Windows CI - BUILDTIME=$(date -u) - fi elif [ "$DOCKER_GITCOMMIT" ]; then GITCOMMIT="$DOCKER_GITCOMMIT" else