Cleanup #1

Merged
JonasFranz merged 7 commits from cleanup into master 2018-09-22 20:56:17 +00:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit f8690081ec - Show all commits

View File

@ -1,12 +1,12 @@
GIT_LAST_COMMIT := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
ifneq ($(DRONE_TAG),)
VERSION ?= $(subst v,,$(DRONE_TAG))
VERSION ?= $(subst v,,$(DRONE_TAG))-$(GIT_LAST_COMMIT)
else
ifneq ($(DRONE_BRANCH),)
VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
VERSION ?= $(subst release/v,,$(DRONE_BRANCH))-$(GIT_LAST_COMMIT)
else
VERSION ?= master
VERSION ?= master-$(GIT_LAST_COMMIT)
endif
endif