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

Go mod: explicit golang.org/x/net replace #1953

Merged
merged 3 commits into from
Apr 17, 2020

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Apr 16, 2020

This PR is in reference to: #1952

From my fork:

➜ go mod tidy -v
get "golang.org/x/net": found meta tag get.metaImport{Prefix:"golang.org/x/net", VCS:"git", RepoRoot:"https://go.googlesource.com/net"} at //golang.org/x/net?go-get=1
go: go.etcd.io/etcd@v0.0.0-20190815204525-8f85f0dc2607 requires
	golang.org/x/net@v0.0.0-20190813000000-74dc4d7220e7: invalid pseudo-version: does not match version-control timestamp (2019-08-13T14:13:03Z)

After updating go.mod with my changes:

➜ go mod tidy -v
go: downloading google.golang.org/grpc v1.25.1
go: downloading github.com/prometheus/prometheus v1.8.2-0.20191126064551-80ba03c67da1
...

And is successful!

I've run go mod tidy && go mod vendor with the included changes. Also checked everything with make test. Let me know if this needs anything else!!

@CLAassistant
Copy link

CLAassistant commented Apr 16, 2020

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

Thanks for this!

@cyriltovena cyriltovena merged commit 39e98d5 into grafana:master Apr 17, 2020
@jpmcb jpmcb deleted the update-gomod branch April 17, 2020 14:29
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.

None yet

4 participants