From b80aa3d7e09716d4ba18a5ebbebc9f146196a37c Mon Sep 17 00:00:00 2001
From: btromanova <tr@uber.com>
Date: Thu, 16 Jan 2020 10:53:19 +0100
Subject: [PATCH] Include tvm into the astro tarball (#61)

This addresses #58.

Changes:

archive -> archives as the latest version of goreleaser only recognize the plural one
add tvm to the goreleaser builds (also add build id otherwise it defaults to project_name)
add note to readme to say that tvm is included
updated changelog
---
 .goreleaser.yml | 27 ++++++++++++++++++---------
 CHANGELOG.md    |  5 +++++
 README.md       |  3 +++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 809aefc..a98c54a 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,17 +1,18 @@
 project_name: astro
-archive:
-  format_overrides:
-    - goos: darwin
-      format: zip
-  replacements:
-    amd64: 64-bit
-    386: 32-bit
-    darwin: macOS
+archives:
+  - format_overrides:
+      - goos: darwin
+        format: zip
+    replacements:
+      amd64: 64-bit
+      386: 32-bit
+      darwin: macOS
 before:
   hooks:
     - go mod download
 builds:
-  - binary: astro
+  - id: astro
+    binary: astro
     main: ./astro/cli/astro/main.go
     env:
       - GO111MODULE=on
@@ -20,6 +21,14 @@ builds:
         goarch: 386
     ldflags:
       - -s -w -X github.com/uber/astro/astro/cli/astro/cmd.version={{.Version}} -X github.com/uber/astro/astro/cli/astro/cmd.commit={{.ShortCommit}} -X github.com/uber/astro/astro/cli/astro/cmd.date={{.Date}}
+  - id: tvm
+    binary: tvm
+    main: ./astro/tvm/cli/tvm/main.go
+    env:
+      - GO111MODULE=on
+    ignore:
+      - goos: darwin
+        goarch: 386
 changelog:
   sort: asc
   filters:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c6da2c..daa6d49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # astro changelog
 
+## 0.6.0 (January 15, 2020)
+
+### Added
+* Add `tvm` binary to astro release
+
 ## 0.5.0 (October 3, 2019)
 
 ### Added
diff --git a/README.md b/README.md
index 6a05e3f..6d9d9b7 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,9 @@ This will install a binary called `astro` in your `$GOPATH/bin`.
 
 Alternatively, you can download precompiled binaries from the [Github releases page](https://github.com/uber/astro/releases).
 
+Note that from version 0.6.0 `tvm`, a tool to download and install specific versions of Terraform for your platforms,
+is packaged together with astro.
+
 **Configuration**
 
 Astro looks for a configuration file called `astro.yaml` in the current or parent directories. It is recommended to place this file in the same top-level directory of your project where the Terraform code exists (e.g. `terraform/astro.yaml`).