diff --git a/Makefile b/Makefile index 69e0dc59..fe19f732 100644 --- a/Makefile +++ b/Makefile @@ -162,7 +162,7 @@ tools/.git: git submodule update --init $(RUNNER_EXE): tools/.git - make -C tools/runner + GO15VENDOREXPERIMENT=1 make -C tools/runner $(PUBLISH): publish_%: $(IMAGES_UPTODATE) $(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION) diff --git a/vagrant-common.rb b/vagrant-common.rb index d54127fb..704d024e 100644 --- a/vagrant-common.rb +++ b/vagrant-common.rb @@ -1,4 +1,4 @@ -$go_version = "1.4.2" +$go_version = "1.5.2" $go_path = "/usr/local/go/bin"