Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

use branch name instead of tag in revision of RPM packages

Browse source
This commit is contained in:
Steffen Vogel 2017-07-07 09:56:59 +02:00
parent 3252247182
commit a32f51bb47
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -93,14 +93,11 @@ VERSION := $(shell git describe --tags --abbrev=0 --match v*)
VERSION_NUM := $(shell VERSION=$(VERSION); echo $${VERSION:1})
ifdef CI
GIT_REV := $(shell REV=$${CI_BUILD_REF}; echo $${REV:0:7})
GIT_BRANCH = ${CI_BUILD_REF_NAME}
VARIANT := $(VARIANT)-ci
else
GIT_REV := $(shell REV=$$(git rev-parse HEAD); echo $${REV:0:7})
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
endif
GIT_REV := $(shell git rev-parse --short=7 HEAD)
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
# pkg-config dependencies
PKGS = libconfig