Merge pull request #823 from r2d4/fix-cloudbuild-release

Fix cloudbuild release yaml
GoogleContainerTools · Jul 13, 2018 · e6f37af · e6f37af
2 parents fa82f78 + c732054
commit e6f37af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ BUILD_PACKAGE = $(REPOPATH)/cmd/skaffold
 
 VERSION_PACKAGE = $(REPOPATH)/pkg/skaffold/version
 COMMIT = $(shell git rev-parse HEAD)
-VERSION = $(shell git describe --always --tags --dirty)
+VERSION ?= $(shell git describe --always --tags --dirty)
 
 GO_LDFLAGS :="
 GO_LDFLAGS += -X $(VERSION_PACKAGE).version=$(VERSION)

diff --git a/deploy/cloudbuild-release.yaml b/deploy/cloudbuild-release.yaml
@@ -31,6 +31,7 @@ steps:
     - 'make'
     - '-j'
     - 'release'
+    - 'VERSION=$TAG_NAME'
     - 'RELEASE_BUCKET=$_RELEASE_BUCKET'
     - 'GCP_PROJECT=$PROJECT_ID'