diff options
author | James Fargher <proglottis@gmail.com> | 2020-08-28 01:35:24 +0300 |
---|---|---|
committer | James Fargher <proglottis@gmail.com> | 2020-08-28 01:35:24 +0300 |
commit | 042ce4755886b7e6f628e0d7f38cf220279de485 (patch) | |
tree | dad715ab22056d8058fe09f737518dbcfaff0cb3 | |
parent | 1f0b1740e98525102b3b1c6650a01cd57fe311c7 (diff) |
Allow lightweight release tagslightweight_version_tags
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -48,7 +48,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") -GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) +GITALY_VERSION := $(shell git describe --tags --exact-match --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) GO_LDFLAGS := -ldflags '-X ${GITALY_PACKAGE}/internal/version.version=${GITALY_VERSION} -X ${GITALY_PACKAGE}/internal/version.buildtime=${BUILD_TIME}' GO_TEST_LDFLAGS := -X gitlab.com/gitlab-org/gitaly/auth.timestampThreshold=5s GO_BUILD_TAGS := tracer_static,tracer_static_jaeger,continuous_profiler_stackdriver,static,system_libgit2 |