From 068764c2b0517cfb30d2c49a2ccc7773ccf6ba95 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Thu, 30 May 2019 10:23:43 -0700 Subject: [PATCH] build*: use --always with git describe git describe --dirty can fail in some cases without --always. This can cause travis to fail. --- build | 2 +- build_releases | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build b/build index 1649a1107..a048a7826 100755 --- a/build +++ b/build @@ -12,7 +12,7 @@ export GOFLAGS=-mod=vendor if [ -z ${VERSION+a} ]; then echo "Using version from git..." - VERSION=$(git describe --dirty) + VERSION=$(git describe --dirty --always) fi GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}" diff --git a/build_releases b/build_releases index 78a982469..8c26a0f2d 100755 --- a/build_releases +++ b/build_releases @@ -9,7 +9,7 @@ GLDFLAGS=${GLDFLAGS:-} if [ -z ${VERSION+a} ]; then echo "Using version from git..." - VERSION=$(git describe --dirty) + VERSION=$(git describe --dirty --always) fi GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}"