diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-05-20 14:47:47 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-05-20 14:49:00 +0300 |
| commit | 26797a702283d427892e5d8e2fb117a0285ee6e7 (patch) | |
| tree | 0598ec4f04557169098a2fe36abb7e2253e4f8d5 | |
| parent | d39f7a0cb7a6ad7c89f1c8e79a0dd0661b0f7e88 (diff) | |
Makefile: Fix GITALY_VERSION's use of git
To compute the Gitaly version, we're using plain "git" invocation. Given
that we're modifying PATH to point to a placeholder "git" executable,
this may not work.
Fix the issue by using "${GIT}" instead.
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -53,7 +53,7 @@ GOLANGCI_LINT_CONFIG ?= ${SOURCE_DIR}/.golangci.yml BUNDLE_DEPLOYMENT ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo false || echo true) 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 --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_BUILD_TAGS := tracer_static,tracer_static_jaeger,continuous_profiler_stackdriver,static,system_libgit2 |