1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00

Merge pull request #1981 from marquiz/devel/fix-version-parsing-2

Makefile: fix version parsing
This commit is contained in:
Kubernetes Prow Robot 2024-12-13 10:38:26 +01:00 committed by GitHub
commit 68e1108874
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -29,7 +29,7 @@ SITE_BASEURL ?=
SITE_DESTDIR ?= _site SITE_DESTDIR ?= _site
JEKYLL_OPTS := -d '$(SITE_DESTDIR)' $(if $(SITE_BASEURL),-b '$(SITE_BASEURL)',) JEKYLL_OPTS := -d '$(SITE_DESTDIR)' $(if $(SITE_BASEURL),-b '$(SITE_BASEURL)',)
VERSION := $(shell git describe --tags --dirty --always) VERSION := $(shell git describe --tags --dirty --always --match "v*")
IMAGE_REGISTRY ?= registry.k8s.io/nfd IMAGE_REGISTRY ?= registry.k8s.io/nfd
IMAGE_TAG_NAME ?= $(VERSION) IMAGE_TAG_NAME ?= $(VERSION)