From b2f90789d2fb8745572cfb74144c7499dd2b8e0c Mon Sep 17 00:00:00 2001 From: Leonid Bugaev Date: Thu, 9 Oct 2014 11:37:00 +0400 Subject: [PATCH] Instead of godep just clone elasticgo repo --- .gitignore | 1 - .travis.yml | 2 +- Dockerfile | 2 -- Makefile | 4 ++-- README.md | 3 +-- elasticsearch.go | 4 ++-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0018fa2..dfabfec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ *.swp -Godeps *.gor diff --git a/.travis.yml b/.travis.yml index 239e896..33c2f50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: go go: 1.2.1 -script: sudo -E bash -c "source /etc/profile && gvm use go1.2.1 && export GOPATH=$HOME/gopath:$GOPATH && go get github.com/tools/godep && godep go test -v" +script: sudo -E bash -c "source /etc/profile && gvm use go1.2.1 && export GOPATH=$HOME/gopath:$GOPATH && go test -v" diff --git a/Dockerfile b/Dockerfile index 234e18a..83774b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM google/golang -RUN go get github.com/tools/godep - WORKDIR /gopath/src/gor ADD . /gopath/src/gor \ No newline at end of file diff --git a/Makefile b/Makefile index 154094c..a05df68 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,10 @@ dbuild: docker build -t gor . dtest: - docker run -v `pwd`:/gopath/src/gor -t -i gor godep go test -v + docker run -v `pwd`:/gopath/src/gor -t -i gor go test -v drun: - docker run -v `pwd`:/gopath/src/gor -t -i gor godep go run $(SOURCE) --input-dummy=0 --output-dummy=0 --verbose + docker run -v `pwd`:/gopath/src/gor -t -i gor go run $(SOURCE) --input-dummy=0 --output-dummy=0 --verbose dbash: docker run -v `pwd`:/gopath/src/gor -t -i gor /bin/bash \ No newline at end of file diff --git a/README.md b/README.md index 8dc43b9..78b4d47 100644 --- a/README.md +++ b/README.md @@ -197,12 +197,11 @@ https://github.com/buger/gor/releases ``` ## Building from source -We use `godep` for managing dependencies, you can find instructions here: https://github.com/tools/godep. Basically it means that all `go` calls should be prefixed by `godep` command. 1. Setup standard Go environment http://golang.org/doc/code.html and ensure that $GOPATH environment variable properly set. 2. `go get github.com/buger/gor`. 3. `cd $GOPATH/src/github.com/buger/gor` -4. `godep go build` to get binary, or `go test` to run tests +4. `go build` to get binary, or `go test` to run tests ## Development Project contains Docker environment. diff --git a/elasticsearch.go b/elasticsearch.go index 0e8fe29..2ef8ea4 100644 --- a/elasticsearch.go +++ b/elasticsearch.go @@ -2,8 +2,8 @@ package main import ( "encoding/json" - "github.com/mattbaird/elastigo/api" - "github.com/mattbaird/elastigo/core" + "github.com/buger/elastigo/api" + "github.com/buger/elastigo/core" "log" "net/http" "regexp"