external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use exactly matching tag in citus_version output (#3828) 

Instead of using the git tag that is reachable from the HEAD commit,
use the exactly matching tag in citus_version().

For the other branches (including the master), just use name of the
current branch that we are installing citus and sha of the HEAD.
This is because, we do not tag the branches except the release ones.

That way, we won't see v9.2.3-DO-NOT-INSTALL tag anymore in the output
of the citus_version();
pull/3760/head^2
Onur Tirtir 2020-05-13 15:05:07 +03:00 committed by GitHub
parent ac1ec40bfb
commit a024389ab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.global.in
View File

@ -23,7 +23,14 @@ PGXS:=$(shell $(PG_CONFIG) --pgxs)
# release # release
ifneq (@GIT_BIN@,) ifneq (@GIT_BIN@,)
ifneq (@HAS_DOTGIT@,) ifneq (@HAS_DOTGIT@,)
GIT_VERSION := "$(shell @GIT_BIN@ describe --dirty --always --tags)" # try to find a tag that exactly matches the current branch, swallow the error if cannot find such a tag
GIT_VERSION := "$(shell @GIT_BIN@ describe --exact-match --dirty --always --tags 2>/dev/null)"
# if there is not a tag that exactly matches the branch, then GIT_VERSION would still be empty
# in that case, set GIT_VERSION with current branch's name and the short sha of the HEAD
ifeq ($(GIT_VERSION),"")
GIT_VERSION := "$(shell @GIT_BIN@ rev-parse --abbrev-ref HEAD)(sha: $(shell @GIT_BIN@ rev-parse --short HEAD))"
endif
endif endif
endif endif