Upgrade Rust to 1.68.2 #31276
Upgrade Rust to 1.68.2 #31276
Conversation
There was a problem hiding this comment.
The changes look good to me.
FWIW, looks like Rust 1.69.0 is scheduled to be released tomorrow:
https://blog.rust-lang.org/inside-rust/2023/04/17/1.69.0-prerelease.html
Is it OK to wait one day and get the new version?
And regardless of which version we chose, we'll need CI images that contain the new version.
I do not have a strong opinion here.
Based on the Docker Hub history, it seems that @yihau is the one uploading those images. |
yeah, i'm aware of immeminent 1.69. but personally, i'd like to soak our 500k loc monorepo a bit with 1.68.x for a week or two without jumping... :): |
|
cc: @yihau also note that it still need to be decided to bundle nightly update as per: #31099 (comment) |
|
@ryoqun do we prefer to upgrade the nightly version in this PR or in another one? |
i wanna try to see the sscache bug is still occurring with the very recent nightly. |
|
okay! I'm going to upgrade those docker images. one sec |
|
uploaded and retried the pipeline! I will create another PR for testing nightly version bumping |
Codecov Report
@@ Coverage Diff @@
## master #31276 +/- ##
=======================================
Coverage 81.5% 81.5%
=======================================
Files 733 733
Lines 207009 207009
=======================================
+ Hits 168731 168809 +78
+ Misses 38278 38200 -78 |
ci/rust-version.sh
Outdated
| if ! cargo +"$toolchain" -V > /dev/null; then | ||
| echo "$0: Missing toolchain? Installing...: $toolchain" >&2 | ||
| rustup install "$toolchain" | ||
| rustup +"$toolchain" componnent add clippy rustfmt |
There was a problem hiding this comment.
oops. there's no set -e here...? prefer separate pr...
There was a problem hiding this comment.
I think you are looking at an incremental change in the PR, rather than the PR as a whole.
Here is the commit in this PR that adds this line: solana-labs/solana@07602dc (#31276)
I've added this to see if the CI would make more progress before the images would be available.
The change adds this whole line
rustup +"$toolchain" component add clippy rustfmt
I do not fully understand how the CI is structured, so, let me remove this change altogether.
Overall, it seems that CI runs rustup with the "minimal" profile.
At the same time, expecting clippy and rustfmt. Both are not part of the "minumal" profile.
The command has no effect if the component was already installed by the preceding rustup install "$toolchain".
There was a problem hiding this comment.
Here is the component addition as a separate PR: #31280
There was a problem hiding this comment.
Hm... Seems like this change is indeed necessary: https://buildkite.com/solana-labs/solana/builds/94223#01879d48-2e7a-4c7b-8367-869da1aa8102
I do not understand it, but let me bring the component addition change back into this PR.
There was a problem hiding this comment.
Ah, it did not use the updated image, it seems.
The CI log shows:
++exec docker run --workdir /solana --volume
/var/lib/buildkite-agent/builds/ci37/solana-labs/solana:/solana --rm --volume
/var/lib/buildkite-agent:/home --env RUSTC_WRAPPER=/home/.cargo/bin/sccache
--env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env SCCACHE_BUCKET --env
SCCACHE_REGION --env SCCACHE_S3_KEY_PREFIX --env HOME=/home --env
CARGO_HOME=/home/.cargo --security-opt seccomp=unconfined --user 997:997 --env
BUILDKITE --env BUILDKITE_AGENT_ACCESS_TOKEN --env BUILDKITE_JOB_ID --env CI
--env CI_BRANCH --env CI_BASE_BRANCH --env CI_TAG --env CI_BUILD_ID --env
CI_COMMIT --env CI_JOB_ID --env CI_PULL_REQUEST --env CI_REPO_SLUG --env
CRATES_IO_TOKEN -e CODECOV_ENV -e CODECOV_TOKEN -e CODECOV_URL -e CODECOV_SLUG
-e VCS_COMMIT_ID -e VCS_BRANCH_NAME -e VCS_PULL_REQUEST -e VCS_SLUG -e VCS_TAG
-e CI_BUILD_URL -e CI_BUILD_ID -e CI_JOB_ID -e CI -e BUILDKITE -e
BUILDKITE_BRANCH -e BUILDKITE_BUILD_NUMBER -e BUILDKITE_JOB_ID -e
BUILDKITE_BUILD_URL -e BUILDKITE_PROJECT_SLUG -e BUILDKITE_COMMIT -t
solanalabs/rust-nightly:2023-01-22 ci/test-checks.sh
error: toolchain '1.68.2-x86_64-unknown-linux-gnu' is not installed
ci/test-checks.sh: Missing toolchain? Installing...: 1.68.2
So it is using solanalabs/rust-nightly, rather than solanalabs/rust:latest.
There was a problem hiding this comment.
I have removed the rustup components command.
But CI is failing now.
There was a problem hiding this comment.
just retried the pipeline. it's running 🪖
There was a problem hiding this comment.
oh, thanks for those extra effort for my picky review comments... really appreciate logically-cleaner pr.
There was a problem hiding this comment.
It is good you started this conversation, I think.
This is what the reviews are for :)
4 participants
Dependabot now needs 1.68: dependabot/dependabot-core#7066