From da7a4e6cab9adb41b075bbeea11f0ba26b100237 Mon Sep 17 00:00:00 2001
From: Matt Reiferson <mreiferson@gmail.com>
Date: Sun, 5 Jan 2014 14:08:19 -0500
Subject: [PATCH] update Godeps and fix travis

---
 .travis.yml | 13 +++----------
 Godeps      |  4 ++++
 test.sh     |  5 -----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d0c1dee4..9dd1bd6ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,10 @@ go:
 env:
   - GOARCH=amd64
   - GOARCH=386
-install:
-  - go get github.com/kr/godep || true
-  # these need to be installed manually for go1.0.x
-  - go get github.com/bitly/go-nsq
-  - go get github.com/bitly/go-simplejson
-  - go get github.com/bitly/go-hostpool
-  - go get github.com/mreiferson/go-snappystream
-  - go get github.com/bmizerany/assert
-  - go get github.com/bmizerany/perks/quantile
 script:
-  - export PATH="$HOME/gopath/bin:$PATH"
+  - wget "http://bitly-downloads.s3.amazonaws.com/nsq/godep.linux-$(go env GOARCH).tar.gz"
+  - tar zxvf "godep.linux-$(go env GOARCH).tar.gz"
+  - export GOPATH="$(./godep path):$GOPATH"
   - ./test.sh
 notifications:
   email: false
diff --git a/Godeps b/Godeps
index 26f60a581..bd28109f8 100644
--- a/Godeps
+++ b/Godeps
@@ -9,6 +9,10 @@
 			"ImportPath": "code.google.com/p/snappy-go/snappy",
 			"Rev": "12e4b4183793ac4b061921e7980845e750679fd0"
 		},
+		{
+			"ImportPath": "github.com/BurntSushi/toml",
+			"Rev": "2dff11163ee667d51dcc066660925a92ce138deb"
+		},
 		{
 			"ImportPath": "github.com/bitly/go-hostpool",
 			"Rev": "58b95b10d6ca26723a7f46017b348653b825a8d6"
diff --git a/test.sh b/test.sh
index d5c8d237e..e3374d4fa 100755
--- a/test.sh
+++ b/test.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 set -e
 
-if go version | grep -q -v "go1.0"; then
-    # godep doesn't build for go1 so dont use it
-    export GOPATH=$(godep path):$GOPATH
-fi
-
 # build and run nsqlookupd
 echo "building and starting nsqlookupd"
 go build -o nsqlookupd/nsqlookupd ./nsqlookupd