Skip to content

Commit

Permalink
Sync dep/glide files and verify dep files remain in sync
Browse files Browse the repository at this point in the history
Signed-off-by: Prithvi Raj <p.r@uber.com>
  • Loading branch information
vprithvi committed Jan 22, 2019
1 parent 0e30338 commit a73cb35
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 20 deletions.
119 changes: 109 additions & 10 deletions Gopkg.lock

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

20 changes: 10 additions & 10 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[[constraint]]
name = "github.com/codahale/hdrhistogram"

[[constraint]]
name = "github.com/go-kit/kit"
version = "0.5.0"

[[constraint]]
name = "github.com/influxdata/influxdb"
name = "github.com/codahale/hdrhistogram"
branch = "master"

[[constraint]]
name = "github.com/prometheus/client_golang"
version = "0.8.0"
name = "github.com/uber-go/tally"
version = ">=2.1.0, <4.0.0"

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

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

[[constraint]]
name = "github.com/uber-go/tally"
version = ">=2.1.0, <4.0.0"
[prune]
go-tests = true
unused-packages = true
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ test-and-lint: test fmt lint

.PHONY: test
test:
ifeq ($(USE_DEP),true)
make verify-dep
endif
$(GOTEST) $(PACKAGES) | $(COLORIZE)

.PHONY: fmt
Expand Down Expand Up @@ -60,6 +63,9 @@ else
glide install
endif

.PHONY: verify-dep
verify-dep:
dep check

.PHONY: cover
cover:
Expand Down

0 comments on commit a73cb35

Please sign in to comment.