Split driver compilation from cross build

pull/2033/head
Matt Rickard 2017-10-04 15:02:55 -07:00
parent 8dbe63d697
commit e213fceb99
2 changed files with 6 additions and 2 deletions

View File

@ -183,7 +183,7 @@ $(GOPATH)/bin/go-bindata:
GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
.PHONY: cross
cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe out/docker-machine-driver-hyperkit out/docker-machine-driver-kvm2
cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
.PHONY: e2e-cross
e2e-cross: e2e-linux-amd64 e2e-darwin-amd64 e2e-windows-amd64.exe

View File

@ -44,9 +44,13 @@ export GOPATH=~/go
# We build these on Linux, but run the tests on different platforms.
# This makes it easier to provision slaves, since they don't need to have a go toolchain.'
# Cross also builds the hyperkit and kvm2 drivers.
BUILD_IN_DOCKER=y make cross e2e-cross
BUILD_IN_DOCKER=y make cross
BUILD_IN_DOCKER=y make e2e-cross
cp -r test/integration/testdata out/
BUILD_IN_DOCKER=y make out/docker-machine-driver-hyperkit
BUILD_IN_DOCKER=y make out/docker-machine-driver-kvm2
# Don't upload the buildroot artifacts if they exist
rm -r out/buildroot || true