From 10dbf340a6f7dd1bd3034be87555d309633d3582 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Tue, 23 Feb 2016 12:58:38 -0600 Subject: [PATCH] Build with Go 1.6 * Mention requiring Go 1.6+ in the README in preparation for a follow up PR which updates our docs / Makefile to align with our vendored dependencies. --- Godeps/Godeps.json | 4 ++-- README.md | 2 +- Vagrantfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 5a588e9b7..5bfec721a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/hashicorp/terraform", - "GoVersion": "go1.5", + "GoVersion": "go1.6", "Packages": [ "./..." ], @@ -715,7 +715,7 @@ { "ImportPath": "github.com/jen20/riviera/sql", "Rev": "64de55fa8cdd0c52f7d59494c1b03c1b583c52b4" - }, + }, { "ImportPath": "github.com/jmespath/go-jmespath", "Comment": "0.2.2-2-gc01cf91", diff --git a/README.md b/README.md index 16bc83d10..20172b89c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ All documentation is available on the [Terraform website](http://www.terraform.i Developing Terraform -------------------- -If you wish to work on Terraform itself or any of its built-in providers, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.4+ is *required*). Alternatively, you can use the Vagrantfile in the root of this repo to stand up a virtual machine with the appropriate dev tooling already set up for you. +If you wish to work on Terraform itself or any of its built-in providers, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.6+ is *required*). Alternatively, you can use the Vagrantfile in the root of this repo to stand up a virtual machine with the appropriate dev tooling already set up for you. For local dev first make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH). You will also need to add `$GOPATH/bin` to your `$PATH`. Next, install the following software packages, which are needed for some dependencies: diff --git a/Vagrantfile b/Vagrantfile index 9ee9a8676..3e9d89dda 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ VAGRANTFILE_API_VERSION = "2" $script = <