Merge pull request #163 from jrasell/b_goreleaser

goreleaser and travis updates for new release tooling.
hashicorp · May 11, 2018 · 934da05 · 934da05
2 parents d1ee543 + cd59cf8
commit 934da05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -17,15 +17,9 @@ builds:
     # For more info refer to https://golang.org/doc/install/source#environment
     goarch:
       - amd64
-      - i386
+      - 386
       - arm
 
-    # List of combinations of GOOS + GOARCH + GOARM to ignore.
-    # Default is empty.
-    ignore:
-      - goos: darwin
-        goarch: arm
-
     # Custom ldflags template.
     # This is parsed with Golang template engine and the following variables
     # are available:
@@ -35,7 +29,7 @@ builds:
     # - Version (Tag with the `v` prefix stripped)
     # The default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`
     # Date format is `2006-01-02_15:04:05`
-    ldflags: -s -w -X main.Name={{ .ProjectName }} -X main.Version={{.Version}} -X main.GitCommit={{.Commit}} -X main.BuildDate={{.Date}} -X main.GitBranch={{.Tag}} -X main.GitState={{.Tag}} -X main.GitSummary={{.Commit}}"
+    ldflags: -s -w -X main.Version={{.Version}} -X main.GitCommit={{.Commit}} -X main.BuildDate={{.Date}} -X main.GitBranch={{.Tag}} -X main.GitState={{.Tag}} -X main.GitSummary={{.Commit}}"
 
 archive:
   # You can change the name of the archive.
@@ -56,14 +50,6 @@ archive:
   # Default is `tar.gz`
   format: binary
 
-  # Additional files/globs you want to add to the archive.
-  # Defaults are any files matching `LICENCE*`, `LICENSE*`,
-  # `README*` and `CHANGELOG*` (case-insensitive)
-  #files:
-  #  - LICENSE
-  #  - README.md
-  #  - CHANGELOG.md
-
 release:
   # Repo in which the release will be created.
   # Default is extracted from the origin remote URL.

diff --git a/.travis.yml b/.travis.yml
@@ -10,20 +10,3 @@ after_success:
 - if [[ -n "$TRAVIS_TAG" ]]; then make release; fi
 notifications:
   email: true
-deploy:
-  provider: releases
-  go: "1.10"
-  api_key:
-    secure: T1ciNa/JVB5j36eq2j4sO3eh95y8+B1Y/cEvNz0jLBYCVKpFfcG34MCLBX1XWtUXeaDRWmtB7W5OfFjcHbE0WvkZxgq3CZSaSFvauiPFfSLRNRZi9SD+/p9HA71HRUySUggRbB9TheP3d4oBX0q+h0ZHzpgyUl+jmbVwn48h2iOgKKmBfvSHwv1HNfKvR9RYqS+DUQHHV524ObNvHdy3ERQ3vHzObfIvRfrBhWcURtqsLMPeS2UAWqXoCEUWtugUjEHqcDdAnuv85J5QiIIEbqXvOVl6Nq5xmKf6TfOSgegIZQ1/c/oEp+IcPVn0coOg7uWaV5SZMXfTgszxAs4neqG6rFco1fuIy8rYgtnp/JaPfjo9hEv5V0vR3ea9YfDzQ1BXLeD+e/EmYxWCs1IOg4IlbnhcSau+GyZTQuVrzXCGgEt25IU9NO3/qkng+ze1frN9NphaNtpSJw40NyfS9EL1tiLXfZgT7ZnJbkQCO0iD4Shi0pIWWpgMCF+e5VzDI38IFrdgCpVC4rhkG9Y2dRJbuXMYgZ3o4uboFKAY9oZnAcbimtP9rN+AbxvqSdDFuB1QXpIYaqD1cra5miOq9ok3/yGnOIQy1yEX1ruA/hRYKPNfvb+JpDqPQa4plkR8DPweWzzIl9ZuFxbXxn+MvYBYL2Eub30q3qL4Xnp5c+0=
-  file:
-    - dist/darwin-386-levant
-    - dist/darwin-amd64-levant
-    - dist/freebsd-386-levant
-    - dist/freebsd-amd64-levant
-    - dist/freebsd-arm-levant
-    - dist/linux-386-levant
-    - dist/linux-amd64-levant
-    - dist/linux-arm-levant
-  skip_cleanup: true
-  on:
-    tags: true