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

Update x/sys and x/net modules to support Risc-V #1984

Merged
merged 2 commits into from
Aug 28, 2019
Merged

Update x/sys and x/net modules to support Risc-V #1984

merged 2 commits into from
Aug 28, 2019

Conversation

carlosedp
Copy link
Contributor

Updating projects using libraries that were recently updated to support Risc-V architecture.

Go upstream work is tracked on: golang/go#27532

Risc-V software support tracker on https://github.com/carlosedp/riscv-bringup

Signed-off-by: CarlosEDP me@carlosedp.com

Copy link
Member

@mxinden mxinden left a comment

Choose a reason for hiding this comment

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

Interesting. This looks good to me, but I will leave this open for @simonpasquier as he has also been involved in prometheus/prometheus#5621.

Thanks @carlosedp.

Copy link
Member

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

Ideally the bump should be done in the upstream repositories for anything that is an indirect dependency as it would benefit other consumers of those modules too.

go.mod Outdated
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc
golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98 // indirect
golang.org/x/tools v0.0.0-20190118193359-16909d206f00
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

From github.com/miekg/dns, this repository hasn't yet moved to Go modules but it's in progress (miekg/dns#980).

go.mod Outdated
golang.org/x/tools v0.0.0-20190118193359-16909d206f00
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

From github.com/prometheus/client_golang/prometheus which is already enabled for Go modules.

go.mod Outdated
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 // indirect
golang.org/x/text v0.3.2 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

From github.com/PuerkitoBio/purell (via github.com/go-openapi/spec) which isn't Go modules ready.

@carlosedp
Copy link
Contributor Author

@simonpasquier actually the bump only added an indirect reference to x/sys. The tools and crypto were already there.
I might take a look if those require bumps as well later.
Do you think we can proceed here?

@carlosedp
Copy link
Contributor Author

Ping @simonpasquier

@carlosedp
Copy link
Contributor Author

Hey @simonpasquier , can I rebase this PR?

@simonpasquier
Copy link
Member

@carlosedp go ahead!

@carlosedp
Copy link
Contributor Author

@simonpasquier done! Some weird error on test_frontend...

@simonpasquier
Copy link
Member

Yes see #2013, you'll need to rebase after it merges.

@carlosedp
Copy link
Contributor Author

Ah, ok. I'll wait till it's merged.

@simonpasquier
Copy link
Member

It's merged 😏

@carlosedp
Copy link
Contributor Author

I've rebased but still errors....

carlosedp and others added 2 commits August 28, 2019 10:32
Signed-off-by: CarlosEDP <me@carlosedp.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier
Copy link
Member

It was a CI glitch. I've removed the go 1.13 directive from go.mod and it should be ok to merge on green.

@simonpasquier simonpasquier merged commit f21c04b into prometheus:master Aug 28, 2019
@simonpasquier
Copy link
Member

Thanks!

@carlosedp
Copy link
Contributor Author

Thanks for the merge and sorry about the 1.13 directive!

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.

3 participants