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.

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

Conversation

vprithvi
Copy link
Contributor

Which problem is this PR solving?

  • Gopkg.lock files can get out of sync with gopkg.yaml files causing interesting issues when jaeger-lib is a transitive dependency.

Short description of the changes

  • Add a verification step dep check which fails if these files are out of sync
  • Remove unnecessary dependencies from Gopkg.yaml and reorder to match glide.yaml

@vprithvi vprithvi requested a review from yurishkuro January 22, 2019 19:51
@ghost ghost assigned vprithvi Jan 22, 2019
@ghost ghost added the review label Jan 22, 2019
Signed-off-by: Prithvi Raj <p.r@uber.com>
@codecov
Copy link

codecov bot commented Jan 22, 2019

Codecov Report

Merging #69 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff          @@
##           master    #69   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files          26     26           
  Lines         890    890           
=====================================
  Hits          890    890

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0e30338...d47f068. Read the comment docs.

[[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

Makefile Outdated
@@ -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

Signed-off-by: Prithvi Raj <p.r@uber.com>
@yurishkuro yurishkuro merged commit d036253 into jaegertracing:master Jan 22, 2019
@ghost ghost removed the review label Jan 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants