From 0e424373cbb8cba822c4335a7cf610a7a4236f0f Mon Sep 17 00:00:00 2001
From: Leo Correa <lcorr005@gmail.com>
Date: Sat, 20 Feb 2016 16:10:24 -0500
Subject: [PATCH] Setup travis to use 1.6 and tip

---
 .travis.yml        | 9 +++------
 CHANGELOG.md       | 1 +
 Godeps/Godeps.json | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f5edd11..4498b91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,9 @@
 language: go
 
 go:
-  - 1.5
+  - 1.6
   - tip
 
-env:
-  - GO15VENDOREXPERIMENT=1
-
 before_install:
   - go get github.com/golang/lint/golint
   - go get golang.org/x/tools/cmd/vet
@@ -64,7 +61,7 @@ after_script:
 before_deploy:
   - PLATFORMS=(darwin/386 darwin/amd64 linux/386 linux/amd64 windows/386 windows/amd64)
   - BINARY=snag
- # build binary for all archs
+  # build binary for all archs
   - |
     for PLATFORM in "${PLATFORMS[@]}"; do
       echo "Building $PLATFORM"
@@ -102,4 +99,4 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-    condition: "$TRAVIS_GO_VERSION == *1.5*"
+    condition: "$TRAVIS_GO_VERSION == *1.6*"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00de8e6..50808cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Snag follows [semantic versioning](http://semver.org/).
 
 **your contribution here**
 
+* [#60](https://github.com/Tonkpils/snag/pull/60) setup travis and use go 1.6
 * [#59](https://github.com/Tonkpils/snag/pull/59) better parsing of quoted arguments
 * [#57](https://github.com/Tonkpils/snag/pull/57) vendor dependencies with Godeps/GO15VENDOREXPERIMENT
 * [#53](https://github.com/Tonkpils/snag/pull/53) Add init command for a sample `.snag.yml`
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 87a7705..eeed232 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/Tonkpils/snag",
-	"GoVersion": "go1.5",
+	"GoVersion": "go1.6",
 	"Packages": [
 		"./..."
 	],