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

Bump rust version to resolve builds #223

Merged
merged 4 commits into from
Apr 7, 2024

Conversation

jsturtevant
Copy link
Collaborator

Use rust-toolchain.toml file over makefile installation.
Signed-off-by: James Sturtevant <[email protected]>
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 24.97%. Comparing base (693f4c5) to head (486b4e8).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #223      +/-   ##
==========================================
+ Coverage   24.33%   24.97%   +0.64%     
==========================================
  Files          16       16              
  Lines        2655     2651       -4     
==========================================
+ Hits          646      662      +16     
+ Misses       2009     1989      -20     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Add convenient helper make function and use it in CI

Signed-off-by: James Sturtevant <[email protected]>
@jsturtevant jsturtevant force-pushed the bump-rust-version branch 2 times, most recently from a02c225 to 4bfe9f9 Compare March 21, 2024 19:26
Fix clippy suggestion

Signed-off-by: James Sturtevant <[email protected]>
Signed-off-by: James Sturtevant <[email protected]>
@@ -0,0 +1,4 @@
[toolchain]
channel="1.77.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I feel that it best not to pin in one version?
Or using https://doc.rust-lang.org/cargo/reference/manifest.html?#the-rust-version-field

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It was locked to a version in a previous PR: #179. Whic is causing the failures in #219

Using the toolchain file doesn't force that version, it just determines the toolchain to use if not already overridden. It be overridden via other commands: https://rust-lang.github.io/rustup/overrides.html.

I don't think the rust-version field helps with tool chain installation, but we can certainly set it as a minimal version. Any ideas on the what version it should be set to?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

added the min rust-version

Copy link
Collaborator

@wllenyj wllenyj Apr 2, 2024

Choose a reason for hiding this comment

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

Thanks, LGTM.
The minnest version is the same as home v0.5.9.

error: package `home v0.5.9` cannot be built because it requires rustc 1.70.0 or newer, while the currently active rustc version is 1.66.1

Add a rust minimal version
Signed-off-by: James Sturtevant <[email protected]>
@jsturtevant jsturtevant requested a review from wllenyj March 29, 2024 23:58
@jsturtevant jsturtevant mentioned this pull request Apr 1, 2024
@lifupan lifupan merged commit 44b31f7 into containerd:master Apr 7, 2024
12 checks passed
Tim-Zhang added a commit that referenced this pull request Sep 24, 2024
[v0.7] Backport of "Bump rust version to resolve builds" #223
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.

Cannot use with home 0.5.9 and rust 1.68 together
3 participants