Skip to content

Commit 18cdc34

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]> (cherry picked from commit f4cc3d8)
1 parent f3f71a9 commit 18cdc34

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PROJECT := github.com/opencontainers/runc
1212
BUILDTAGS ?= seccomp
1313

1414
COMMIT ?= $(shell git describe --dirty --long --always)
15-
VERSION ?= $(shell cat ./VERSION)
15+
VERSION := $(shell cat ./VERSION)
1616
LDFLAGS_COMMON := -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION)
1717

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

0 commit comments

Comments
 (0)