From 03bea3dd2dcaa194973d6b9b7957f976c7b31fcd Mon Sep 17 00:00:00 2001 From: Bartlomiej Zimon Date: Sat, 29 Jul 2017 19:21:17 +0200 Subject: [PATCH] fix version [me@here esp-link]$ git describe --tags --match 'v*.0' --long --dirty | sed -re 's/(\.0)?-/./' v3.1.47-g9c6530d-dirty [me@here esp-link]$ git describe --tags --match 'v*.*.*' --long --dirty | sed -re 's/(\.0)?-/./' v3.2.47.alpha.0-g9c6530d-dirty --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 365749b..aa496d8 100644 --- a/Makefile +++ b/Makefile @@ -191,7 +191,7 @@ TRAVIS_BRANCH?=$(shell git symbolic-ref --short HEAD --quiet) # Use git describe to get the latest version tag, commits since then, sha and dirty flag, this # results is something like "v1.2.0-13-ab6cedf-dirty" NO_TAG ?= "no-tag" -VERSION := $(shell (git describe --tags --match 'v*.0' --long --dirty || echo $(NO_TAG)) | sed -re 's/(\.0)?-/./') +VERSION := $(shell (git describe --tags --match 'v*.*.*' --long --dirty || echo $(NO_TAG)) | sed -re 's/(\.0)?-/./') # If not on master then insert the branch name ifneq ($(TRAVIS_BRANCH),master) ifneq ($(findstring V%,$(TRAVIS_BRANCH)),)