Skip to content

Commit

Permalink
Quick fix to ignore any devel versions
Browse files Browse the repository at this point in the history
Downstream rpeositores (notably submariner-operator) use extra "devel"
version tags which mess up version calculations.

For now, ignore any tags matching devel versions, until we have a more
proper solution.

Signed-off-by: Mike Kolesnik <[email protected]>
  • Loading branch information
mkolesnik authored and mangelajo committed Apr 6, 2021
1 parent e96214b commit 0a66625
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Calculate versions; these can be overridden
CUTTING_EDGE := devel
DEV_VERSION := dev
override CALCULATED_VERSION := $(shell git describe --tags --dirty="-$(DEV_VERSION)" --exclude="$(CUTTING_EDGE)" --exclude="latest")
override CALCULATED_VERSION := $(shell git describe --tags --dirty="-$(DEV_VERSION)" --exclude="*$(CUTTING_EDGE)*" --exclude="latest")
VERSION ?= $(CALCULATED_VERSION)

export CUTTING_EDGE DEV_VERSION VERSION

0 comments on commit 0a66625

Please sign in to comment.