-
Notifications
You must be signed in to change notification settings - Fork 43
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
Patch cargo toolchain for noble #136
Conversation
Signed-off-by: Yadunund <[email protected]>
701d9d6
to
6000d3f
Compare
Signed-off-by: Yadunund <[email protected]>
Signed-off-by: Yadunund <[email protected]>
Signed-off-by: Yadunund <[email protected]>
Signed-off-by: Yadunund <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Besides my changes inline, I think that we should consider approaching this slightly differently.
In particular, it is not whether we are on Iron or Rolling which determines whether we need to remove the ZENOHC_CARGO_CHANNEL, but rather whether we are using the toolchain from rustup, or from Ubuntu (this will also be a factor when we go to make this work on Windows).
Is there any way for us to tell whether the cargo we are using supports the various channels or not? That would be closer to what we are trying to accomplish here.
Co-authored-by: Chris Lalancette <[email protected]> Signed-off-by: Yadu <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]> Signed-off-by: Yadu <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]> Signed-off-by: Yadu <[email protected]>
Signed-off-by: Yadunund <[email protected]>
@clalancette thanks for the feedback. I agree with the logic proposed. I've implemented this by relying on cmake's |
eclipse-zenoh/zenoh-c#300 has been created to address this |
eclipse-zenoh/zenoh-c#301 makes zenoh-c CMakeLists.txt to no longer use However this was pushed after switching Zenoh to Tokio which is currently causing some troubles |
Install latest rustc. | ||
> Note: The version of rustc that can be installed via apt is outdated. | ||
Install latest rustc via `rustup` if building on Ubuntu Jammy. | ||
Skip this step if building on Ubuntu Noble as `cargo` and `rustc` will be |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is cool! When/how did that happen with rosdep? Or does Noble ship debs for rust build tools?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The debs are available in Jammy too but the versions are very dated so we install them via rustup
to compile zenoh. Noble ships with cargo/rustc 1.75.0
which works out of the box for our use case.
Signed-off-by: Yadunund <[email protected]>
@clalancette @JEnoch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable to me to patch this for now.
This PR allows
rmw_zenoh
to build on Ubuntu Noble with all dependencies resolved byrosdep
, ie, users do no need to manually install cargo like we currently specify.This is achieved by patching the zenoh-c/CMakeLists.txt file during the vendor step to drop the
+stable
toolchain specification. Further, we pin the version of cargo to be used as1.75.0
on all platforms since this is the versions of cargo available via apt in Noble.Also created a temporary rolling CI job that passes to demonstrate that the fix works. This is interim until docker image for rolling+noble is ready.
CI is working again 🎉