Skip to content

Commit

Permalink
Merge pull request #1535 from simonbaird/revert-version-snafu
Browse files Browse the repository at this point in the history
Revert version snafu
simonbaird authored Apr 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents a33bf5f + 3a9ba06 commit af07c33
Showing 2 changed files with 1 addition and 7 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
MAKEFLAGS+=-j --no-print-directory
VERSION_FILE=./VERSION
VERSION:=v$$(cat $(VERSION_FILE).$$(git rev-list --count HEAD)-$$(git rev-parse --short HEAD)
VERSION:=v0.3.$$(git rev-list --count HEAD)-$$(git rev-parse --short HEAD)
# a list of "dist/ec_{platform}_{arch}" that we support
ALL_SUPPORTED_OS_ARCH:=$(shell go tool dist list -json|jq -r '.[] | select((.FirstClass == true or .GOARCH == "ppc64le") and .GOARCH != "386") | "dist/ec_\(.GOOS)_\(.GOARCH)"')
# a list of image_* targets that we do not support
@@ -301,7 +300,3 @@ conftest-test-cmd-diff:
$(DIFF_TOOL) \
<(curl -s https://raw.githubusercontent.com/open-policy-agent/conftest/$${CONFTEST_VER}/internal/commands/test.go) \
cmd/test/test.go

# Useful while hacking on build numbers and versions
debug-version:
@echo $(VERSION)
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

0 comments on commit af07c33

Please sign in to comment.