wirtz
/
esp-link
mirror of https://github.com/jeelabs/esp-link.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix version

Browse Source 
[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
pull/458/head
Bartlomiej Zimon 7 years ago committed by Thorsten von Eicken
parent d189a1b3fa
commit 03bea3dd2d
1 changed files with 1 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile

2
Makefile
Unescape View File

@ -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 # 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" # results is something like "v1.2.0-13-ab6cedf-dirty"
NO_TAG ?= "no-tag" 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 # If not on master then insert the branch name
ifneq ($(TRAVIS_BRANCH),master) ifneq ($(TRAVIS_BRANCH),master)
ifneq ($(findstring V%,$(TRAVIS_BRANCH)),) ifneq ($(findstring V%,$(TRAVIS_BRANCH)),)

Write Preview
Loading…
Cancel
Save