Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleans up some small things in preparation for a 0.6.0 RC1. #1345

Merged
merged 4 commits into from
Oct 26, 2015
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates go version to 1.5.1, and modernizes the Vagrantfile.
Drops 32bit in the Vagrantfile as well since we can build that with
gox and don't need a special environment for it. The Vagrantfile is
now just a good default development environment.
  • Loading branch information
James Phillips committed Oct 26, 2015
commit 8738f9780bd30f628508d4e721df0d77ad0bd3b7
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ http://www.consul.io/docs
## Developing Consul

If you wish to work on Consul itself, you'll first need [Go](https://golang.org)
installed (version 1.4+ is _required_). Make sure you have Go properly installed,
installed (version 1.5.1+ is _required_). Make sure you have Go properly installed,
including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH).

Next, clone this repository into `$GOPATH/src/github.com/hashicorp/consul` and
@@ -66,7 +66,7 @@ format the code according to Go standards.

### Building Consul on Windows

Make sure Go 1.4+ is installed on your system and that the Go command is in your
Make sure Go 1.5.1+ is installed on your system and that the Go command is in your
%PATH%.

For building Consul on Windows, you also need to have MinGW installed.
13 changes: 4 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
VAGRANTFILE_API_VERSION = '2'

@script = <<SCRIPT
GOVERSION="1.5.1"
SRCROOT="/opt/go"
SRCPATH="/opt/gopath"

@@ -17,8 +18,8 @@ sudo apt-get install -y build-essential git-core

# Install Go
cd /tmp
wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go1.4.2.linux-${ARCH}.tar.gz
tar -xvf go1.4.2.linux-${ARCH}.tar.gz
wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go${GOVERSION}.linux-${ARCH}.tar.gz
tar -xvf go${GOVERSION}.linux-${ARCH}.tar.gz
sudo mv go $SRCROOT
sudo chmod 775 $SRCROOT
sudo chown vagrant:vagrant $SRCROOT
@@ -56,14 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
end

# Note we use older boxes here to avoid glibc version check problems with
# the built C dependencies.
config.vm.define '64bit' do |n1|
n1.vm.box = 'chef/ubuntu-10.04'
end

config.vm.define '32bit' do |n2|
n2.vm.box = 'chef/ubuntu-10.04-i386'
n1.vm.box = 'hashicorp/precise64'
end

config.push.define "www", strategy: "local-exec" do |push|