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

Allow to overrule the build tag from local.conf if you're not in a git tree.

Browse Source
pull/289/head
dannybackx 8 years ago
parent 149ddef501
commit e21400f085
1 changed files with 2 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. 3
      Makefile

3
Makefile
Unescape View File

@ -189,7 +189,8 @@ 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)?-/./') NO_TAG ?= "no-tag"
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