From 080cf3d83fb949332eeba427a2288f546dc7577a Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 27 Jan 2021 11:18:25 -0800 Subject: [PATCH] fix deb_version issue --- Makefile | 2 ++ hack/jenkins/minikube_cross_build_and_upload.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 891774e1d0..5f006607bf 100644 --- a/Makefile +++ b/Makefile @@ -489,6 +489,8 @@ out/minikube_$(DEB_VERSION).deb: out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_amd cp $< $@ out/minikube_$(DEB_VERSION)-$(DEB_REVISION)_%.deb: out/minikube-linux-% + echo $@ + exit $(eval DEB_PACKAGING_DIRECTORY_$*=$(shell mktemp -d --suffix ".minikube_$(DEB_VERSION)-$*-deb")) cp -r installers/linux/deb/minikube_deb_template/* $(DEB_PACKAGING_DIRECTORY_$*)/ chmod 0755 $(DEB_PACKAGING_DIRECTORY_$*)/DEBIAN diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 89b9cd8e82..5161024b5b 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -43,9 +43,9 @@ docker rm $(docker ps -aq) || true make -j 16 \ all \ minikube-darwin-arm64 \ - out/minikube_$(DEB_VER)_amd64.deb \ - out/minikube_$(DEB_VER)_arm64.deb \ - out/docker-machine-driver-kvm2_$(DEB_VER)-0_amd64.deb \ + out/minikube_${DEB_VER}_amd64.deb \ + out/minikube_${DEB_VER}_arm64.deb \ + out/docker-machine-driver-kvm2_${DEB_VER}-0_amd64.deb \ && failed=$? || failed=$? "out/minikube-$(go env GOOS)-$(go env GOARCH)" version