terraform: revert to using static go_resources, makefile uses go get

Closes #11435.

Signed-off-by: JCount <JCount42@gmail.com>
This commit is contained in:
JCount 2017-03-20 02:23:25 -04:00
parent f3650445b3
commit 6e3c7616d0

View file

@ -1,8 +1,11 @@
require "language/go"
class Terraform < Formula class Terraform < Formula
desc "Tool to build, change, and version infrastructure" desc "Tool to build, change, and version infrastructure"
homepage "https://www.terraform.io/" homepage "https://www.terraform.io/"
url "https://github.com/hashicorp/terraform/archive/v0.9.1.tar.gz" url "https://github.com/hashicorp/terraform/archive/v0.9.1.tar.gz"
sha256 "af8402ce84b85a16cfac3796c1f30f229a0d0e93585c6c618af2f25aae067e65" sha256 "af8402ce84b85a16cfac3796c1f30f229a0d0e93585c6c618af2f25aae067e65"
revision 1
head "https://github.com/hashicorp/terraform.git" head "https://github.com/hashicorp/terraform.git"
bottle do bottle do
@ -16,6 +19,31 @@ class Terraform < Formula
conflicts_with "tfenv", :because => "tfenv symlinks terraform binaries" conflicts_with "tfenv", :because => "tfenv symlinks terraform binaries"
go_resource "github.com/mitchellh/gox" do
url "https://github.com/mitchellh/gox.git",
:revision => "c9740af9c6574448fd48eb30a71f964014c7a837"
end
go_resource "github.com/mitchellh/iochan" do
url "https://github.com/mitchellh/iochan.git",
:revision => "87b45ffd0e9581375c491fef3d32130bb15c5bd7"
end
go_resource "github.com/kisielk/errcheck" do
url "https://github.com/kisielk/errcheck.git",
:revision => "9c1292e1c962175f76516859f4a88aabd86dc495"
end
go_resource "github.com/kisielk/gotool" do
url "https://github.com/kisielk/gotool.git",
:revision => "5e136deb9b893bbe6c8f23236ff4378b7a8a0dbb"
end
go_resource "golang.org/x/tools" do
url "https://go.googlesource.com/tools.git",
:revision => "26c35b4dcf6dfcb924e26828ed9f4d028c5ce05a"
end
# vet error (please remove after next version release) # vet error (please remove after next version release)
# upstream issue: https://github.com/hashicorp/terraform/pull/12839 # upstream issue: https://github.com/hashicorp/terraform/pull/12839
patch do patch do
@ -24,12 +52,18 @@ class Terraform < Formula
end end
def install def install
dir = buildpath/"src/github.com/hashicorp/terraform"
dir.install buildpath.children - [buildpath/".brew_home"]
ENV["GOPATH"] = buildpath ENV["GOPATH"] = buildpath
ENV.prepend_create_path "PATH", buildpath/"bin" ENV.prepend_create_path "PATH", buildpath/"bin"
dir = buildpath/"src/github.com/hashicorp/terraform"
dir.install buildpath.children - [buildpath/".brew_home"]
Language::Go.stage_deps resources, buildpath/"src"
%w[src/github.com/mitchellh/gox src/golang.org/x/tools/cmd/stringer
src/github.com/kisielk/errcheck].each do |path|
cd(path) { system "go", "install" }
end
cd dir do cd dir do
# v0.6.12 - source contains tests which fail if these environment variables are set locally. # v0.6.12 - source contains tests which fail if these environment variables are set locally.
ENV.delete "AWS_ACCESS_KEY" ENV.delete "AWS_ACCESS_KEY"