From 140210237f77df270ba96de6ee347737be1267af Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 25 Oct 2022 18:49:21 +0000 Subject: [PATCH] fix: prefixed tag parsing Signed-off-by: GitHub --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2a19918312..9f60b67246 100644 --- a/Makefile +++ b/Makefile @@ -31,16 +31,16 @@ EXE_EXT = .exe endif # Interrogate the git repo and set some variables -REPO_ROOT = $(shell git rev-parse --show-toplevel) -REVISION ?= $(shell git rev-parse --short HEAD) -ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "cni-dropgz*" --exclude "zapai*" --tags --always) -AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always)) -CNI_VERSION ?= $(ACN_VERSION) -CNI_DROPGZ_VERSION ?= $(notdir $(shell git describe --match "cni-dropgz*" --tags --always)) -CNI_DROPGZ_TEST_VERSION ?= $(notdir $(shell git describe --match "cni-dropgz-test*" --tags --always)) -CNS_VERSION ?= $(ACN_VERSION) -NPM_VERSION ?= $(ACN_VERSION) -ZAPAI_VERSION ?= $(notdir $(shell git describe --match "zapai*" --tags --always)) +REPO_ROOT = $(shell git rev-parse --show-toplevel) +REVISION ?= $(shell git rev-parse --short HEAD) +ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --tags --always) +AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always)) +CNI_VERSION ?= $(ACN_VERSION) +CNI_DROPGZ_VERSION ?= $(notdir $(shell git describe --match "dropgz*" --tags --always)) +CNI_DROPGZ_TEST_VERSION ?= $(notdir $(shell git describe --match "dropgz-test*" --tags --always)) +CNS_VERSION ?= $(ACN_VERSION) +NPM_VERSION ?= $(ACN_VERSION) +ZAPAI_VERSION ?= $(notdir $(shell git describe --match "zapai*" --tags --always)) # Build directories. AZURE_IPAM_DIR = $(REPO_ROOT)/azure-ipam