-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Revert "Revert Rust 1.68.0 upgrade" #31099
Conversation
This reverts commit 3bc670a.
Seems like the CI is showing the failure that caused the #30897 revert: |
} | ||
|
||
#[test] | ||
#[ignore] |
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.
Is it OK that geyser plugins could be broken on master?
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.
nope.. ;)
I'll try to repro this as well later.
Codecov Report
@@ Coverage Diff @@
## master #31099 +/- ##
=========================================
- Coverage 81.5% 81.4% -0.1%
=========================================
Files 733 728 -5
Lines 206917 205019 -1898
=========================================
- Hits 168759 167043 -1716
+ Misses 38158 37976 -182 |
rust-toolchain.toml
Outdated
@@ -1,2 +1,2 @@ | |||
[toolchain] | |||
channel = "1.67.1" | |||
channel = "1.68.0" |
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.
We could also bump to 1.68.2
now. Or, if you only want to bump nightly, the bump to stable
can be removed entirely.
(I understand that then this PR wouldn't be a "revert" anymore though, so can be ignored.)
phew, finally found some time to work on this... good news: newer nightly fixed (no extra work for us, yay)
odd. i could easily repro this on my machine:
@yihau could you bump nightly to $ git diff
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
index 501d2a2bd0..2b43b606de 100644
--- a/ci/rust-version.sh
+++ b/ci/rust-version.sh
@@ -29,7 +29,7 @@ fi
if [[ -n $RUST_NIGHTLY_VERSION ]]; then
nightly_version="$RUST_NIGHTLY_VERSION"
else
- nightly_version=2023-01-22
+ nightly_version=2023-04-19
fi
|
When I first tried the Rust 1.68.0 upgrade, we ran into issues due to sccache. The sccache issue doesn't appear to have any new activity, so I'm not sure if we'll be able to bump the nightly version 😢 Hopefully though! |
Dependabot now needs 1.68 or a newer toolchain. |
Is there a reason we want to upgrade both stable and nightly version of Rust in the same PR? If it is acceptable, consider this PR: #31276 |
Usually we do both since we can, but it's not required. I've been bumping stable some of the last few times without bumping nightly due to memory layout changes that needed to be resolved. |
From the standpoint of bisection and reverting changes, it is better to split things that do not have to be connected. Not sure if there is some time saving optimization in the image generation process. I think it is possible to create GitHub actions that create Docker images and publish it, when files change. |
we can make it automatically. The reason why I haven't implemented it cuz I have some ideas for our ci environment. If the improvement happen, we don't need it anymore. I can adjust the priority if you feel impeded! |
Oh, no, I do not have any immediate need for it :) It seems that the CI scripts will actually install the right toolchain, even if it is not available. Though having it in the image probably saves a few minutes in the CI run. |
closing; there should be a pr with latest nightly rustc soon as all the blocking issues are now resolved. cc: @yihau |
Reverts #30897
I want to use https://doc.rust-lang.org/nightly/std/sync/struct.Arc.html#method.into_inner, which is merged upstream after 1 day after our current nightly rustc...
cc: @yihau @ilya-bobyr