ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-05 05:34:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #8469 from srvg/packageversion_more_gitinfo

Browse source 
packaging: add short hash and branch name in package version for unoffici...
This commit is contained in:
Brian Coca 2015-07-28 19:17:30 -04:00
commit 7a019d930e
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -40,6 +40,11 @@ RELEASE := $(shell cat VERSION | cut -f2 -d' ')
# Get the branch information from git # Get the branch information from git
ifneq ($(shell which git),) ifneq ($(shell which git),)
GIT_DATE := $(shell git log -n 1 --format="%ai") GIT_DATE := $(shell git log -n 1 --format="%ai")
GIT_HASH := $(shell git log -n 1 --format="%h")
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[-_.]//g')
GITINFO = .$(GIT_HASH).$(GIT_BRANCH)
else
GITINFO = ''
endif endif
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1) ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1)
@ -62,7 +67,7 @@ ifeq ($(OFFICIAL),yes)
DEBUILD_OPTS += -k$(DEBSIGN_KEYID) DEBUILD_OPTS += -k$(DEBSIGN_KEYID)
endif endif
else else
DEB_RELEASE = 0.git$(DATE) DEB_RELEASE = 0.git$(DATE)$(GITINFO)
# Do not sign unofficial builds # Do not sign unofficial builds
DEBUILD_OPTS += -uc -us DEBUILD_OPTS += -uc -us
DPUT_OPTS += -u DPUT_OPTS += -u
@ -78,7 +83,7 @@ RPMSPEC = $(RPMSPECDIR)/ansible.spec
RPMDIST = $(shell rpm --eval '%{?dist}') RPMDIST = $(shell rpm --eval '%{?dist}')
RPMRELEASE = $(RELEASE) RPMRELEASE = $(RELEASE)
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
RPMRELEASE = 0.git$(DATE) RPMRELEASE = 0.git$(DATE)$(GITINFO)
endif endif
RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)" RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"