Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove godep in favor of gpm #458

Merged
merged 4 commits into from
Sep 14, 2014
Merged

remove godep in favor of gpm #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7800247
dist: remove godep in favor of gpm
mreiferson Sep 14, 2014
63fe7e2
dockerfile: remove godep in favor of gpm
mreiferson Sep 14, 2014
50d3c10
fix go get
mreiferson Sep 14, 2014
c460b27
travis: remove godep in favor of gpm
mreiferson Sep 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.godeps
build
apps/nsqlookupd/nsqlookupd
apps/nsqd/nsqd
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
52 changes: 8 additions & 44 deletions Godeps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we comment human readable versions on these lines (where we have such a thing) or the date they were last bumped or something? (looks like anything after # should be treated as a comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in terms of date of bumps, that's all in the git history

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair

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
2 changes: 1 addition & 1 deletion apps/nsqd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/nsqlookupd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 3 additions & 2 deletions dist.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion nsqadmin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 0 additions & 2 deletions nsqd/test/empty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build ignore

package test

// This file exists to allow this directory to be built with go build.
Expand Down