diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-18 21:28:36 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-18 21:28:41 +0200 |
| commit | aabf2c598db74783e62e81e4ca008ce47fe130ba (patch) | |
| tree | dcd864de9de67b315d8b4365fad98ff0dff5dc84 | |
| parent | 100450bf7c827826c305cbab0fb00e81bdcd1c77 (diff) | |
Update command used to extract version from tag
Fix for issue SPEC-1782
XDS Version is based on git tags and 3 formats are used to tag the same AGL
version, for example: flounder_6.90.0, flounder/6.90.0, tag: 6.90.0.
For time to time (don't know why always reproducible) the "git describe"
command returns the number version/tag (6.90.0) that is expected and
sometimes it's the string version/tag (flounder/6.90.0) that is
problematic.
Change-Id: I9fdbe93cfea917493a8d4e8346a72cc97cf9c5bd
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ TARGET=xds-cli # Retrieve git tag/commit to set version & sub-version strings -GIT_DESC := $(shell git describe --always --tags) +GIT_DESC := $(shell git describe --always --tags --match "[0-9]*") VERSION := $(firstword $(subst -, ,$(GIT_DESC))) ifeq (-,$(findstring -,$(GIT_DESC))) SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC)) |