Skip to content

Commit f54beec

Browse files
authored
fix: prefixed tag parsing (#1679)
Signed-off-by: GitHub <[email protected]> Signed-off-by: GitHub <[email protected]>
1 parent bc5375d commit f54beec

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ EXE_EXT = .exe
3131
endif
3232

3333
# Interrogate the git repo and set some variables
34-
REPO_ROOT = $(shell git rev-parse --show-toplevel)
35-
REVISION ?= $(shell git rev-parse --short HEAD)
36-
ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "cni-dropgz*" --exclude "zapai*" --tags --always)
37-
AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always))
38-
CNI_VERSION ?= $(ACN_VERSION)
39-
CNI_DROPGZ_VERSION ?= $(notdir $(shell git describe --match "cni-dropgz*" --tags --always))
40-
CNI_DROPGZ_TEST_VERSION ?= $(notdir $(shell git describe --match "cni-dropgz-test*" --tags --always))
41-
CNS_VERSION ?= $(ACN_VERSION)
42-
NPM_VERSION ?= $(ACN_VERSION)
43-
ZAPAI_VERSION ?= $(notdir $(shell git describe --match "zapai*" --tags --always))
34+
REPO_ROOT = $(shell git rev-parse --show-toplevel)
35+
REVISION ?= $(shell git rev-parse --short HEAD)
36+
ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --tags --always)
37+
AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always))
38+
CNI_VERSION ?= $(ACN_VERSION)
39+
CNI_DROPGZ_VERSION ?= $(notdir $(shell git describe --match "dropgz*" --tags --always))
40+
CNI_DROPGZ_TEST_VERSION ?= $(notdir $(shell git describe --match "dropgz-test*" --tags --always))
41+
CNS_VERSION ?= $(ACN_VERSION)
42+
NPM_VERSION ?= $(ACN_VERSION)
43+
ZAPAI_VERSION ?= $(notdir $(shell git describe --match "zapai*" --tags --always))
4444

4545
# Build directories.
4646
AZURE_IPAM_DIR = $(REPO_ROOT)/azure-ipam

0 commit comments

Comments
 (0)