Skip to content

Commit

Permalink
Fix calculation of MAIN_VERSION (and SERIAL_VERSION)
Browse files Browse the repository at this point in the history
We want to use v0.0.9, not 0.0.9, so that golang will find our versions.

Signed-off-by: Serge Hallyn <[email protected]>
  • Loading branch information
hallyn committed Aug 25, 2023
1 parent 6ce2290 commit ae82bbb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions common.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
TOP_D := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))

MAIN_VERSION = $(shell git describe --tags --always \
"--match=[0-9].[0-9]*" "--match=[0-9][0-9].[0-9]*" \
"--match=[0-9]-dev[0-9]*" "--match=[0-9][0-9]-dev[0-9]" \
"--match=v[0-9].[0-9]*" "--match=v[0-9][0-9].[0-9]*" \
|| echo no-git)
ifeq ($(MAIN_VERSION),$(filter $(MAIN_VERSION), "", no-git))
$(error "Bad value for MAIN_VERSION: '$(MAIN_VERSION)'")
Expand Down

0 comments on commit ae82bbb

Please sign in to comment.