File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,8 @@ REGISTRY := wcr.io/oracle
2
2
PKG := github.com/oracle/oci-cloud-controller-manager
3
3
BIN := oci-cloud-controller-manager
4
4
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)
6
7
7
8
GOOS ?= linux
8
9
ARCH ?= amd64
@@ -75,3 +76,7 @@ run-dev:
75
76
--cluster-cidr=10.244.0.0/16 \
76
77
--cloud-provider=external \
77
78
-v=4
79
+
80
+ .PHONY : version
81
+ version :
82
+ @echo ${VERSION}
Original file line number Diff line number Diff line change 8
8
- script :
9
9
name : write VERSION.txt
10
10
code : |
11
- git describe --always --dirty > ${WERCKER_OUTPUT_DIR}/VERSION.txt
11
+ make version > ${WERCKER_OUTPUT_DIR}/VERSION.txt
12
12
cat ${WERCKER_OUTPUT_DIR}/VERSION.txt
13
13
14
14
- script :
You can’t perform that action at this time.
0 commit comments