Skip to content

Commit

Permalink
govendor -> dep
Browse files Browse the repository at this point in the history
  • Loading branch information
travisjeffery committed Oct 10, 2017
1 parent f1ceba1 commit f964a59
Show file tree
Hide file tree
Showing 5 changed files with 343 additions and 362 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ When creating a pull-request you should:
- **Get the deps**:
```
govendor sync
dep ensure
```
(If you don't have govendor, run: `go get -u github.com/kardianos/govendor`)
(If you don't have dep, run: `go get -u github.com/golang/dep/cmd/dep`)
- **Check the tests pass**:
```
Expand Down
264 changes: 264 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/Shopify/sarama"
version = "1.13.0"

[[constraint]]
name = "github.com/gorilla/handlers"
version = "1.2.1"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.5.0"

[[constraint]]
name = "github.com/hashicorp/raft"
revision = "5f09c4ffdbcd2a53768e78c47717415de12b6728"

[[constraint]]
revision = "a8adffd05b79e3d8b1817d46bbe387a112265b3e"
name = "github.com/hashicorp/raft-boltdb"

[[constraint]]
name = "github.com/hashicorp/serf"
version = "0.8.1"

[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"

[[constraint]]
name = "github.com/prometheus/client_golang"
version = "0.8.0"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"

[[constraint]]
name = "github.com/tj/go-gracefully"
revision = "005c1d102f1bf3158f9ba29c12d68a73ac15f321"

[[constraint]]
branch = "master"
name = "github.com/travisjeffery/simplelog"

[[constraint]]
branch = "master"
name = "github.com/tysontate/gommap"

[[constraint]]
name = "gopkg.in/alecthomas/kingpin.v2"
version = "2.2.5"
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ all: deps test

.PHONY: deps
deps:
go get -u github.com/kardianos/govendor
govendor sync
dep ensure

.PHONY: test
test:
govendor test -v -p=1 +local
go test -v ./...

.PHONY: test-race
test-race:
govendor test -v -race -p=1 +local
go test -v -race -p=1 ./...


Loading

0 comments on commit f964a59

Please sign in to comment.