diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-09-20 09:31:57 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-09-20 09:31:57 +0000 |
| commit | a7c424fe96f18ac18b454bd734d9be99c78e452e (patch) | |
| tree | b47da7696d87f9912f9c9a7285c3eb856f56e083 | |
| parent | 52e676c87f931a6d847866ef3018e262459bf11d (diff) | |
| parent | 726945b3921144b77b0ddaf2e34e28e2c34b04de (diff) | |
| download | gitlab-shell-a7c424fe96f18ac18b454bd734d9be99c78e452e.tar.gz | |
Merge branch 'fix-makefile-version-string' into 'main'
makefile: properly escape '$' in VERSION_STRING
See merge request gitlab-org/gitlab-shell!525
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ .PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang coverage coverage_golang setup _script_install build compile check clean install GO_SOURCES := $(shell find . -name '*.go') -VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$0="v"$0' VERSION 2>/dev/null || echo unknown) +VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown) BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S) BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)" |