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

Ensure Gopkg.lock files remain in sync with Gopkg.yaml #69

Merged
merged 2 commits into from
Jan 22, 2019
Merged

Ensure Gopkg.lock files remain in sync with Gopkg.yaml #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a73cb35
Sync dep/glide files and verify dep files remain in sync
vprithvi Jan 22, 2019
d47f068
Address feedback
vprithvi Jan 22, 2019
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
119 changes: 109 additions & 10 deletions Gopkg.lock
View file
Open in desktop

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
View file
Open in desktop
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"
Copy link
Member

Choose a reason for hiding this comment

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

Is there some logic behind the reordering?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes - I reordered it so that the dependencies are in the same order as glide.yaml so that they may be visually compared easier


[[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
View file
Open in desktop
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:
Copy link
Member

Choose a reason for hiding this comment

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

I’d suggest doing away with the separate target, it doesn’t provide much value vs inline command

dep check

.PHONY: cover
cover:
Expand Down