Skip to content

Commit f4cc3d8

Browse files
committed
Revert "allow overriding VERSION value in Makefile"
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: #4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]>
1 parent 0377d50 commit f4cc3d8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BUILDTAGS ?= seccomp urfave_cli_no_docs
1818
BUILDTAGS += $(EXTRA_BUILDTAGS)
1919

2020
COMMIT ?= $(shell git describe --dirty --long --always)
21-
VERSION ?= $(shell cat ./VERSION)
21+
VERSION := $(shell cat ./VERSION)
2222
LDFLAGS_COMMON := -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION)
2323

2424
GOARCH := $(shell $(GO) env GOARCH)

0 commit comments

Comments
 (0)