From 30ab710a2ba34079ed73cf54d3eee5d837cfa614 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Sat, 16 Feb 2019 09:15:02 -0800 Subject: [PATCH 1/2] Bump VERSION_BUILD to 3.4.1, make ISO_VERSION use major.minor.0 --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 181569ed0d..0f80e79210 100755 --- a/Makefile +++ b/Makefile @@ -12,10 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Bump these on release +# Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 0 VERSION_MINOR ?= 34 -VERSION_BUILD ?= 0 +VERSION_BUILD ?= 1 +# 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).0 + VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) @@ -26,12 +29,11 @@ HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.10.x # NOTE: "latest" as of 2018-12-04. kube-cross images aren't updated as often as Kubernetes BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.11.1-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image - -ISO_VERSION ?= v0.34.0 ISO_BUCKET ?= minikube/iso MINIKUBE_VERSION ?= $(ISO_VERSION) MINIKUBE_BUCKET ?= minikube/releases + MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} KERNEL_VERSION ?= 4.16.14 From 29d631fa79ec7e2f2cc7200ddedda48d1328c845 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Sat, 16 Feb 2019 09:18:39 -0800 Subject: [PATCH 2/2] Remove accidental empty line --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 0f80e79210..c4a35e48e5 100755 --- a/Makefile +++ b/Makefile @@ -33,7 +33,6 @@ ISO_BUCKET ?= minikube/iso MINIKUBE_VERSION ?= $(ISO_VERSION) MINIKUBE_BUCKET ?= minikube/releases - MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} KERNEL_VERSION ?= 4.16.14