ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5275 from hashicorp/phinze/go1.6 

Build with Go 1.6
This commit is contained in:
Paul Hinze 2016-02-23 13:46:58 -06:00
parent 09d320fd94 10dbf340a6
commit 94f30b6a2b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{ {
"ImportPath": "github.com/hashicorp/terraform", "ImportPath": "github.com/hashicorp/terraform",
"GoVersion": "go1.5", "GoVersion": "go1.6",
"Packages": [ "Packages": [
"./..." "./..."
], ],
@ -715,7 +715,7 @@
{ {
"ImportPath": "github.com/jen20/riviera/sql", "ImportPath": "github.com/jen20/riviera/sql",
"Rev": "64de55fa8cdd0c52f7d59494c1b03c1b583c52b4" "Rev": "64de55fa8cdd0c52f7d59494c1b03c1b583c52b4"
}, },
{ {
"ImportPath": "github.com/jmespath/go-jmespath", "ImportPath": "github.com/jmespath/go-jmespath",
"Comment": "0.2.2-2-gc01cf91", "Comment": "0.2.2-2-gc01cf91",

2
README.md
View File

@ -29,7 +29,7 @@ All documentation is available on the [Terraform website](http://www.terraform.i
Developing Terraform 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: 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:

2
Vagrantfile vendored
View File

@ -5,7 +5,7 @@
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"
$script = <<SCRIPT $script = <<SCRIPT
GOVERSION="1.5.1" GOVERSION="1.6"
SRCROOT="/opt/go" SRCROOT="/opt/go"
SRCPATH="/opt/gopath" SRCPATH="/opt/gopath"