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

try to fix versioning in Makefile

Browse Source
pull/236/head
Thorsten von Eicken 8 years ago
parent b4595eb792
commit 5d5535a7a9
No known key found for this signature in database
GPG Key ID: C7F972A59D834B46
1 changed files with 3 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. 4
      Makefile

4
Makefile
Unescape View File

@ -189,11 +189,13 @@ endif
TRAVIS_BRANCH?=$(shell git symbolic-ref --short HEAD --quiet) 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"
VERSION := $(shell (git describe --tags --match 'v*' --long --dirty || echo "no-tag") | sed -re 's/(\.0)?-/./') VERSION := $(shell (git describe --tags --match 'v*' --long --dirty || echo "no-tag") | sed -re 's/(v[0-9]*\.[0-9]*)\.[0-9]*-/\1./')
# 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 ($(TRAVIS_BRANCH),$(patsubst -*,,$(VERSION)))
VERSION := $(shell echo $(VERSION) | sed -e 's/-/-$(TRAVIS_BRANCH)-/') VERSION := $(shell echo $(VERSION) | sed -e 's/-/-$(TRAVIS_BRANCH)-/')
endif endif
endif
VERSION :=$(VERSION) VERSION :=$(VERSION)
$(info VERSION is $(VERSION)) $(info VERSION is $(VERSION))

Write Preview
Loading…
Cancel
Save