From c10311bc9a981f1fdea88ba5f488225eaeea2b69 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 3 Dec 2015 10:12:11 -0800 Subject: [PATCH] Fix broken Windows CI Signed-off-by: John Howard --- hack/make.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/make.sh b/hack/make.sh index 4002f783c1..0f811a3adb 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -70,7 +70,11 @@ if command -v git &> /dev/null && git rev-parse &> /dev/null; then if [ -n "$(git status --porcelain --untracked-files=no)" ]; then GITCOMMIT="$GITCOMMIT-dirty" fi - BUILDTIME=$(date --rfc-3339 ns | sed -e 's/ /T/') + ! BUILDTIME=$(date --rfc-3339 ns | 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