Merge pull request #5399 from tstromberg/bad-make

Fix RAW_VERSION/ISO_VERSION typo
kubernetes · Sep 18, 2019 · 8fefeb1 · 8fefeb1
2 parents 58a5a03 + 766e7c4
commit 8fefeb1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -16,11 +16,11 @@
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 4
 VERSION_BUILD ?= 0
-RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).0
+RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).${VERSION_BUILD}
 VERSION ?= v$(RAW_VERSION)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).${VERSION_BUILD}
+ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 RPM_VERSION ?= $(DEB_VERSION)