Skip to content

Commit

Permalink
Revert "allow overriding VERSION value in Makefile"
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
rata committed Aug 19, 2024
1 parent f3f71a9 commit 18cdc34
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PROJECT := github.com/opencontainers/runc
BUILDTAGS ?= seccomp

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

GOARCH := $(shell $(GO) env GOARCH)
Expand Down

0 comments on commit 18cdc34

Please sign in to comment.