From 6b9b502354eac7f333a1dc42616bb35170c0a0df Mon Sep 17 00:00:00 2001 From: Jason Kotzin Date: Fri, 31 May 2019 00:07:20 -0700 Subject: [PATCH] tag correctly if we are on a branch --- src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 6dc9d918..1ba9e2d5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -87,7 +87,7 @@ clean: host_clean all_platforms: $(Q)set -e ;\ - mkdir -p artifacts/$(shell git describe --always) ;\ + mkdir -p artifacts/$(shell git describe --tags --always) ;\ echo "" >> artifacts/index.html ;\ - cp artifacts/*.bin artifacts/$(shell git describe --always) + cp artifacts/*.bin artifacts/$(shell git describe --tags --always) include/version.h: FORCE $(Q)echo " GIT include/version.h" - $(Q)echo "#define FIRMWARE_VERSION \"`git describe --always --dirty`\"" > $@ + $(Q)echo "#define FIRMWARE_VERSION \"`git describe --tags --always --dirty`\"" > $@ -include *.d