Skip to content

Commit 7412dc7

Browse files
committed
Fix $VERSION in Makefile
Recent git versions changed the format of git describe causing a mismatch between versions generated in CI and locally.
1 parent 734a28c commit 7412dc7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ REGISTRY := wcr.io/oracle
22
PKG := github.com/oracle/oci-cloud-controller-manager
33
BIN := oci-cloud-controller-manager
44
IMAGE := $(REGISTRY)/$(BIN)
5-
VERSION := $(shell git describe --always --dirty)
5+
VERSION := $(shell git describe --exact-match 2> /dev/null || \
6+
git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
67

78
GOOS ?= linux
89
ARCH ?= amd64

0 commit comments

Comments
 (0)