Fix a bug in version linking (#159)

* Fix a bug in version linking
solo-io · Aug 17, 2020 · 740262b · 740262b
1 parent 31d7efb
commit 740262b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/changelog/v0.0.26/version-fix.yaml b/changelog/v0.0.26/version-fix.yaml
@@ -0,0 +1,4 @@
+changelog:
+  - type: FIX
+    description: Fix a bug in version linking which caused the version to be 'dev' on release.
+    issueLink: https://github.com/solo-io/wasme/issues/158
diff --git a/docs/Makefile b/docs/Makefile
@@ -7,12 +7,10 @@
 # make serve-site -B
 
 
-
 # remove the "v" prefix
 VERSION ?= $(shell echo $(TAGGED_VERSION) | cut -c 2-)
 
-# GCLOUD_PROJECT_ID Passed by cloudbuild upload-release-assets
-GCLOUD_PROJECT_ID := $(GCLOUD_PROJECT_ID)
+GCLOUD_PROJECT_ID ?= "solo-public"
 
 GCR_REPO_PREFIX ?= gcr.io/$(GCLOUD_PROJECT_ID)
 ### REPLACE with product name

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,6 +1,13 @@
 package version
 
-var DevVersion = "dev"
-
 // This will be set by the linker on release builds
-var Version = DevVersion
+var (
+	Version    string
+	DevVersion = "dev"
+)
+
+func init() {
+	if Version == "" {
+		Version = DevVersion
+	}
+}