Merge branch 'release/1.2.0'

.gitignore

@@ -28,6 +28,7 @@ _testmain.go
 # our binaries
 /inbucket
 /inbucket.exe
+/dist/**
 /target/**
 /cmd/client/client
 /cmd/client/client.exe

.goreleaser.yml

@@ -0,0 +1,60 @@
+project_name: inbucket
+release:
+  github:
+    owner: jhillyerd
+    name: inbucket
+  name_template: '{{.Tag}}'
+brew:
+  commit_author:
+    name: goreleaserbot
+    email: goreleaser@carlosbecker.com
+  install: bin.install ""
+builds:
+  - binary: inbucket
+    goos:
+      - darwin
+      - freebsd
+      - linux
+      - windows
+    goarch:
+      - amd64
+    goarm:
+      - "6"
+    main: .
+    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
+  - binary: client
+    goos:
+      - darwin
+      - freebsd
+      - linux
+      - windows
+    goarch:
+      - amd64
+    goarm:
+      - "6"
+    main: ./cmd/client
+    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
+archive:
+  format: tar.gz
+  wrap_in_directory: true
+  name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{
+    .Arm }}{{ end }}'
+  format_overrides:
+    - goos: windows
+      format: zip
+  files:
+    - LICENSE*
+    - README*
+    - CHANGELOG*
+    - inbucket.bat
+    - etc/**/*
+    - themes/**/*
+fpm:
+  bindir: /usr/local/bin
+snapshot:
+  name_template: SNAPSHOT-{{ .Commit }}
+checksum:
+  name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
+dist: dist
+sign:
+  artifacts: none

.goxc.json

@@ -7,7 +7,6 @@
 	"Os": "darwin freebsd linux windows",
 	"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
 	"PackageVersion": "1.2.0",
-	"PrereleaseInfo": "rc2",
 	"ConfigVersion": "0.9",
 	"BuildSettings": {
 		"LdFlagsXVars": {
@@ -15,4 +14,4 @@
 			"Version": "main.VERSION"
 		}
 	}
-}
+}

.travis.yml

@@ -1,11 +1,21 @@
 language: go
 sudo: false
 
+env:
+  - DEPLOY_WITH_MAJOR="1.9"
+
 before_script:
   - go vet ./...
 
 go:
-  - 1.8.5
+  - 1.8.x
-  - 1.9.2
+  - 1.9.x
 
 script: go test -race -v ./...
+
+deploy:
+  provider: script
+  script: etc/travis-deploy.sh
+  on:
+    tags: true
+    branch: master

CHANGELOG.md

@@ -4,6 +4,13 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+[1.2.0] - 2017-12-27
+--------------------
+
+### Changed
+
+- No significant code changes from rc2
+
 [1.2.0-rc2] - 2017-12-15
 ------------------------
 
@@ -92,6 +99,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   specific message.
 
 [Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop
+[1.2.0]:      https://github.com/jhillyerd/inbucket/compare/1.2.0-rc2...1.2.0
 [1.2.0-rc2]:  https://github.com/jhillyerd/inbucket/compare/1.2.0-rc1...1.2.0-rc2
 [1.2.0-rc1]:  https://github.com/jhillyerd/inbucket/compare/1.1.0...1.2.0-rc1
 [1.1.0]:      https://github.com/jhillyerd/inbucket/compare/1.1.0-rc2...1.1.0

etc/docker/install.sh

@@ -15,11 +15,14 @@ apk add --no-cache --virtual .build-deps git
 
 # Setup
 export GOBIN="$bindir"
-builddate="$(date -Iseconds)"
 cd "$srcdir"
-go clean
+# Fetch tags for describe
+git fetch -t
+builddate="$(date -Iseconds)"
+buildver="$(git describe --tags --always)"
 
 # Build
+go clean
 echo "### Fetching Dependencies"
 go get -t -v ./...
 
@@ -27,7 +30,7 @@ echo "### Testing Inbucket"
 go test ./...
 
 echo "### Building Inbucket"
-go build -o inbucket -ldflags "-X 'main.BUILDDATE=$builddate'" -v .
+go build -o inbucket -ldflags "-X 'main.version=$buildver' -X 'main.date=$builddate'" -v .
 
 echo "### Installing Inbucket"
 set -x

etc/travis-deploy.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# travis-deploy.sh
+# description: Trigger goreleaser deployment in correct build scenarios
+
+set -eo pipefail
+set -x
+
+if [[ "$TRAVIS_GO_VERSION" == "$DEPLOY_WITH_MAJOR."* ]]; then
+  curl -sL https://git.io/goreleaser | bash
+fi

inbucket.go

@@ -23,11 +23,11 @@ import (
 )
 
 var (
-	// VERSION contains the build version number, populated during linking by goxc
+	// version contains the build version number, populated during linking
-	VERSION = "1.2.0-rc2"
+	version = "1.2.0"
 
-	// BUILDDATE contains the build date, populated during linking by goxc
+	// date contains the build date, populated during linking
-	BUILDDATE = "undefined"
+	date = "undefined"
 
 	// Command line flags
 	help    = flag.Bool("help", false, "Displays this help")
@@ -61,8 +61,8 @@ func init() {
 }
 
 func main() {
-	config.Version = VERSION
+	config.Version = version
-	config.BuildDate = BUILDDATE
+	config.BuildDate = date
 
 	flag.Parse()
 	if *help {