Skip to content

Commit 0af7e47

Browse files
authored
Merge pull request #590 from erikh/go1.7
Makefile,Vagrantfile: Build on 1.7.3
2 parents b47a55b + e188024 commit 0af7e47

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TAR_FILENAME := $(NAME)-$(VERSION).$(TAR_EXT)
1818
TAR_LOC := .
1919
TAR_FILE := $(TAR_LOC)/$(TAR_FILENAME)
2020
GO_MIN_VERSION := 1.5.1
21-
GO_MAX_VERSION := 1.6.2
21+
GO_MAX_VERSION := 1.8
2222
GO_VERSION := $(shell go version | cut -d' ' -f3 | sed 's/go//')
2323
GOLINT_CMD := golint -set_exit_status
2424
GOFMT_CMD := gofmt -s -l

Vagrantfile

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
require 'fileutils'
55

66
# netplugin_synced_gopath="/opt/golang"
7+
go_version = ENV["GO_VERSION"] || "1.7.3"
78
gopath_folder="/opt/gopath"
89

910
cluster_ip_nodes = ""
@@ -26,6 +27,10 @@ echo "export CLUSTER_NODE_IPS=$3" >> /etc/profile.d/envvar.sh
2627
echo "export CONTIV_CLUSTER_STORE=$7" >> /etc/profile.d/envvar.sh
2728
source /etc/profile.d/envvar.sh
2829
30+
rm -rf /usr/local/go
31+
32+
curl -sSL https://storage.googleapis.com/golang/go#{go_version}.linux-amd64.tar.gz | sudo tar -xz -C /usr/local
33+
2934
if [[ $# -gt 9 ]] && [[ $10 != "" ]]; then
3035
shift; shift; shift; shift; shift; shift; shift; shift; shift
3136
echo "export $@" >> /etc/profile.d/envvar.sh

0 commit comments

Comments
 (0)