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

Upgrade rust to 1.74.0 #1365

Closed
wants to merge 9 commits into from

Conversation

fishseabowl
Copy link
Contributor

This PR fixed the issue "Github Action for cargo-udeps failed" as mentioned in issue #1364

@glihm
Copy link
Collaborator

glihm commented Jan 9, 2024

Hey @fishseabowl thanks for the contribution here!

Would appreciate your input on the discussion started on the issue. 👍

Fixes #1407.

@fishseabowl fishseabowl changed the title fix: Github Action for cargo-udeps failed #1364 Upgrade rust to 1.74.0 Jan 10, 2024
Copy link
Member

@kariy kariy left a comment

Choose a reason for hiding this comment

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

Don't forget to change it in the release ci as well

RUST_VERSION: 1.70.0

@codecov-commenter
Copy link

codecov-commenter commented Jan 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3fd7f3c) 67.41% compared to head (89b38d0) 67.41%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1365   +/-   ##
=======================================
  Coverage   67.41%   67.41%           
=======================================
  Files         218      218           
  Lines       20978    20978           
=======================================
  Hits        14142    14142           
  Misses       6836     6836           

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

@fishseabowl
Copy link
Contributor Author

Don't forget to change it in the release ci as well

RUST_VERSION: 1.70.0

Thanks for your reminder. Has changed.

@fishseabowl
Copy link
Contributor Author

Hello @kariy, could you please take a look at the reported errors? It mentions that: = note: the wasm32-unknown-unknown target may not be installed in ci/ensure-wasm, and error: 'cargo-clippy' is not installed for the toolchain '1.74.0-x86_64-unknown-linux-gnu' in ci/clippy, even though it's installed in the Dockerfile.

@fishseabowl fishseabowl requested a review from kariy January 10, 2024 16:38
@glihm
Copy link
Collaborator

glihm commented Jan 10, 2024

Hello @kariy, could you please take a look at the reported errors? It mentions that: = note: the wasm32-unknown-unknown target may not be installed in ci/ensure-wasm, and error: 'cargo-clippy' is not installed for the toolchain '1.74.0-x86_64-unknown-linux-gnu' in ci/clippy, even though it's installed in the Dockerfile.

Don't we need to publish an updated version of the dev container to match the toolchain version bump? Because for the build, toolchains are automatically downloaded if not present on the system. But components may be adjusted in this case.

@glihm
Copy link
Collaborator

glihm commented Jan 10, 2024

@kariy @tarrencev does something like this makes sense #1411?

The idea is to be able to push some devcontainer updates without directly relying on the rust-toolchain file, which may affect the whole building system, only to have the good version to release devcontainer (as it seems to be the case now).

Never made devcontainer release, I'm perhaps missing something.

WDYT?

@fishseabowl
Copy link
Contributor Author

Hello @kariy, could you please take a look at the reported errors? It mentions that: = note: the wasm32-unknown-unknown target may not be installed in ci/ensure-wasm, and error: 'cargo-clippy' is not installed for the toolchain '1.74.0-x86_64-unknown-linux-gnu' in ci/clippy, even though it's installed in the Dockerfile.

Don't we need to publish an updated version of the dev container to match the toolchain version bump? Because for the build, toolchains are automatically downloaded if not present on the system. But components may be adjusted in this case.

@glihm Yes, the dev container will automatically match the rust-toolchain version, as shown in the following code:

RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
rustup component add clippy && \
rustup component add rustfmt

However, the ci/wasm and ci/clippy processes report errors related to uninstalled components, which seems strange.

@glihm
Copy link
Collaborator

glihm commented Jan 10, 2024

Hello @kariy, could you please take a look at the reported errors? It mentions that: = note: the wasm32-unknown-unknown target may not be installed in ci/ensure-wasm, and error: 'cargo-clippy' is not installed for the toolchain '1.74.0-x86_64-unknown-linux-gnu' in ci/clippy, even though it's installed in the Dockerfile.

Don't we need to publish an updated version of the dev container to match the toolchain version bump? Because for the build, toolchains are automatically downloaded if not present on the system. But components may be adjusted in this case.

@glihm Yes, the dev container will automatically match the rust-toolchain version, as shown in the following code:

RUN rustup toolchain install $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
rustup default $(cat rust-toolchain.toml | grep channel | cut -d\" -f2) && \
rustup component add clippy && \
rustup component add rustfmt

However, the ci/wasm and ci/clippy processes report errors related to uninstalled components, which seems strange.

Yup, in the meantime, @fishseabowl could you try with this image? glihm/dojo:1.74.0
I just built it with the according toolchain version to validate #1411.
https://hub.docker.com/r/glihm/dojo

@tarrencev
Copy link
Contributor

@kariy @tarrencev does something like this makes sense #1411?

The idea is to be able to push some devcontainer updates without directly relying on the rust-toolchain file, which may affect the whole building system, only to have the good version to release devcontainer (as it seems to be the case now).

Never made devcontainer release, I'm perhaps missing something.

WDYT?

yup that makes sense!

@glihm
Copy link
Collaborator

glihm commented Jan 10, 2024

@fishseabowl actually can you update with the new version of the dojo container?
https://github.com/dojoengine/dojo/pkgs/container/dojo-dev/165725993?tag=136a67a

@fishseabowl
Copy link
Contributor Author

@fishseabowl actually can you update with the new version of the dojo container? https://github.com/dojoengine/dojo/pkgs/container/dojo-dev/165725993?tag=136a67a

@glihm Yes. Done. Thank you for your help!

@glihm
Copy link
Collaborator

glihm commented Jan 11, 2024

@fishseabowl do appreciate you've started all the work on this bump and identified the root reason.

The changes to the container triggered the auto PR that at the end is covering 100% of this PR. Apologize for that, I didn't had enough perspective to detect this earlier.

I'll close this one for now, thanking you again for the time dedicated to this.

@glihm glihm closed this Jan 11, 2024
@fishseabowl fishseabowl deleted the 1364_cargo-udeps branch January 19, 2024 02:22
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.

5 participants