Merge pull request #458 from mreiferson/bye_godep_458

remove godep in favor of gpm
nsqio · Sep 14, 2014 · 23a4b88 · 23a4b88
2 parents a5570e7 + c460b27
commit 23a4b88
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.godeps
 build
 apps/nsqlookupd/nsqlookupd
 apps/nsqd/nsqd

diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ env:
   - GOARCH=amd64
   - GOARCH=386
 script:
-  - 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"
+  - curl -s https://raw.githubusercontent.com/pote/gpm/v1.2.3/bin/gpm > gpm
+  - chmod +x gpm
+  - ./gpm install
   - ./test.sh
 notifications:
   email: false
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
 FROM google/golang:latest
 
-RUN go get -u github.com/tools/godep
-RUN go get -u github.com/bmizerany/assert
+RUN curl -s https://raw.githubusercontent.com/pote/gpm/v1.2.3/bin/gpm > /usr/local/bin/gpm
+RUN chmod +x /usr/local/bin/gpm
 
 ADD . $GOPATH/src/github.com/bitly/nsq
-RUN godep get github.com/bitly/nsq/...
-RUN cd $GOPATH/src/github.com/bitly/nsq && godep restore
+RUN cd $GOPATH/src/github.com/bitly/nsq && gpm install
+RUN go get github.com/bitly/nsq/...
 
 RUN cd $GOPATH/src/github.com/bitly/nsq && ./test.sh
diff --git a/Godeps b/Godeps
@@ -1,44 +1,8 @@
-{
-	"ImportPath": "github.com/bitly/nsq",
-	"GoVersion": "go1.3",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"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"
-		},
-		{
-			"ImportPath": "github.com/bitly/go-nsq",
-			"Comment": "v1.0.1-alpha",
-			"Rev": "ac221df5bdb6d5bfc624a297b5b00b59d7065be2"
-		},
-		{
-			"ImportPath": "github.com/bitly/go-simplejson",
-			"Comment": "v0.5.0-alpha",
-			"Rev": "fc395a5db941cf38922b1ccbc083640cd76fe4bc"
-		},
-		{
-			"ImportPath": "github.com/bmizerany/perks/quantile",
-			"Rev": "6cb9d9d729303ee2628580d9aec5db968da3a607"
-		},
-		{
-			"ImportPath": "github.com/mreiferson/go-options",
-			"Rev": "896a539cd709f4f39d787562d1583c016ce7517e"
-		},
-		{
-			"ImportPath": "github.com/mreiferson/go-snappystream",
-			"Comment": "v0.2.0",
-			"Rev": "307a466b220aaf34bcee2d19c605ed9e96b4bcdb"
-		}
-	]
-}
+code.google.com/p/snappy-go/snappy      12e4b4183793ac4b061921e7980845e750679fd0
+github.com/BurntSushi/toml              2dff11163ee667d51dcc066660925a92ce138deb
+github.com/bitly/go-hostpool            58b95b10d6ca26723a7f46017b348653b825a8d6
+github.com/bitly/go-nsq                 ac221df5bdb6d5bfc624a297b5b00b59d7065be2 # v1.0.1-alpha
+github.com/bitly/go-simplejson          fc395a5db941cf38922b1ccbc083640cd76fe4bc # v0.5.0-alpha
+github.com/bmizerany/perks/quantile     6cb9d9d729303ee2628580d9aec5db968da3a607
+github.com/mreiferson/go-options        896a539cd709f4f39d787562d1583c016ce7517e
+github.com/mreiferson/go-snappystream   307a466b220aaf34bcee2d19c605ed9e96b4bcdb # v0.2.0
diff --git a/apps/nsqd/Dockerfile b/apps/nsqd/Dockerfile
@@ -1,6 +1,6 @@
 FROM nsqio/nsq:latest
 
-RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqd && godep go build .
+RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqd && go build .
 VOLUME ["/data"]
 EXPOSE 4150
 EXPOSE 4151

diff --git a/apps/nsqlookupd/Dockerfile b/apps/nsqlookupd/Dockerfile
@@ -1,6 +1,6 @@
 FROM nsqio/nsq:latest
 
-RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqlookupd && godep go build .
+RUN cd /gopath/src/github.com/bitly/nsq/apps/nsqlookupd && go build .
 EXPOSE 4160
 EXPOSE 4161
 

diff --git a/dist.sh b/dist.sh
@@ -2,11 +2,12 @@
 
 # build binary distributions for linux/amd64 and darwin/amd64
 
-export GOPATH=$(godep path):$GOPATH
-
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 mkdir -p $DIR/dist
 
+mkdir -p $DIR/.godeps
+export GOPATH=$DIR/.godeps
+
 os=$(go env GOOS)
 arch=$(go env GOARCH)
 version=$(cat $DIR/util/binary_version.go | grep "const BINARY_VERSION" | awk '{print $NF}' | sed 's/"//g')

diff --git a/nsqadmin/Dockerfile b/nsqadmin/Dockerfile
@@ -1,6 +1,6 @@
 FROM nsqio/nsq:latest
 
-RUN cd /gopath/src/github.com/bitly/nsq/nsqadmin && godep go build .
+RUN cd /gopath/src/github.com/bitly/nsq/nsqadmin && go build .
 EXPOSE 4171
 
 ENTRYPOINT ["/gopath/src/github.com/bitly/nsq/nsqadmin/nsqadmin"]
diff --git a/nsqd/test/empty.go b/nsqd/test/empty.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package test
 
 // This file exists to allow this directory to be built with go build.