kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1581 from justinsb/fix_1057 

Record git version of what we're building
This commit is contained in:
Justin Santa Barbara 2017-01-25 00:16:38 -05:00 committed by GitHub
parent f0c2e8206b b584aebbc3
commit 8154ab7bd2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -31,6 +31,8 @@ MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.5.1 DNS_CONTROLLER_TAG=1.5.1
GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always)
ifndef VERSION ifndef VERSION
# To keep both CI and end-users building from source happy, # To keep both CI and end-users building from source happy,
# we expect that CI sets CI=1. # we expect that CI sets CI=1.
@ -45,11 +47,10 @@ ifndef VERSION
ifndef CI ifndef CI
VERSION=1.5.0-alpha4 VERSION=1.5.0-alpha4
else else
VERSION := git-$(shell git describe --always) VERSION := git-${GITSHA}
endif endif
endif endif
GITSHA := $(shell git describe --always)
# Go exports: # Go exports: