Merge branch 'release/2.1.0'

albertrdixon · Apr 20, 2015 · e3a34c8 · e3a34c8
2 parents 32cae2d + ecab593
commit e3a34c8
Show file tree

Hide file tree

Showing 31 changed files with 1,575 additions and 454 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,22 @@ os: linux
 language: go
 go: 1.4.2
 
-install: go get github.com/tools/godep
+install: 
+  - go get github.com/tools/godep
+  - go get github.com/mitchellh/gox
+before_script: make dep-restore
 script: make test-verbose
-after_success: make package
+after_success:
+  - "cd $GOROOT/src && GOOS=darwin GOARCH=amd64 ./make.bash --no-clean && cd -"
+  - make package
 
 deploy:
   provider: releases
   api_key:
     secure: gE+O8G3DK0jhYc7lIIz9wlRLSZTXau7WdWz3dQqG/DAPvkJbjcGAjA3WmW81KcEs4Ob0ODIdChSGJY5+px/w0aFTdAAP27NvoPRwute2VcLRevpjCglroqz3girj3KUVJmACtya4h/nJZ3Eo20/6/lTJTE6y6W9dVhbwx1DpKlM=
-  file: tnator-linux-amd64.tar.gz
+  file:
+    - tnator-linux-amd64.tar.gz
+    - tnator-darwin-amd64.tar.gz
   on:
     repo: albertrdixon/tmplnator
     tags: true
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go