-
Notifications
You must be signed in to change notification settings - Fork 891
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
dist: bump rustup
version to 1.27.0
#3653
Conversation
e814230
to
86ec5e5
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Thanks for working on this! https://rust-lang.github.io/rustup/dev-guide/release-process.html Just a reminder:
I guess the point is we need to release it based on the stable branch. Thanks again! Very excited to see rustup |
@hi-rustin Oops, looks like now stable and master are (and might always be) one commit off? ... or is it possible to force-push master to stable? (cc @kinnison) |
@rami3l Can we merge that commit back to master? |
@hi-rustin Rather, I meant that I'm not very sure if our branch protection rules allow me to force-push on Update: Just asked infra, it turns out there are currently no restrictions on that. I'll try that then. (Sorry for overwriting your commit!) |
Generally speaking (a) you should always merge back to master whatever ended up on stable after a release and (b) if stable does end up out-of-sync you need to carefully unpick what/why because it's the commit SHAs on stable which end up in release binaries so you don't want to lose them if at all possible. |
Otherwise, congratulations on this release, it looks like an excellent combination of features and fixes. |
@kinnison Thanks for the info! I checked again and I believe this change has been covered by #3491. dist/release-1-27...stable gives: Also, according to the current diff, the latest stable checksum to date is |
@rami3l I think there are two solutions for this issue.
I will run some quick tests for the second solution. If it works, then we won't need to do a force push. |
I tested soultion2 in my forked repo:
It seemed to work well. Sorry again for forgetting to merge that commit back. I will let the team make the decision! Thanks again for working on this! |
@hi-rustin Thanks again for trying it out! However it still looks problematic in our case since GitHub Merge Queue is in action now and I guess that might change the shasums on step 2 anyway (unless I can still merge manually just for the release, I'm not quite sure about that). We have full control over the |
I see, we are using the rebase merge method now. But I guess this would also cause a problem when we want to merge the stable back to the master after we release 1.27.0. |
Exactly, so IMHO we shouldn't. More precisely, from now on The only subtlety remaining seems to be the commit shasum in the release:
In conclusion, with the new merge-queue-enabled workflow, if we still do the release in one PR:
There is even a way of making 2 accessible on |
I believe this is by design. You can find it in https://rust-lang.github.io/rustup/dev-guide/release-process.html. Because we need to update the Cargo.lock and push it first. After that, we can get the commit for updating the Cargo.lock. After we finally build the binary and release it, then we get the different commits for them. For instance: |
In that case, I guess we can try to initiate the release process. Next, since this is the first release since such a long time, I propose doing a beta-testing phase by (quoting @kinnison)
I expect to keep it like that without actually releasing for a few weeks. Thus, I'm marking this PR as ready again. |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
3fbccb3
to
e5299e5
Compare
e5299e5
to
c3d8374
Compare
Note: As we have decided to include a beta-testing phase, merging this PR doesn't imply a new release (yet), so #3501 won't be closed for now. However, we sincerely invite everyone in this thread to try out the beta by setting the following env variable:
Here's the relevant internals forum thread: https://internals.rust-lang.org/t/seeking-beta-testers-for-rustup-1-27-0/20352 |
cc #3501.
Concerns
Changelog
1.27.0 - 2024-03-08
This long-awaited Rustup release has gathered all the new features and fixes since April 2023.
These changes include improvements in Rustup's maintainability, user experience, compatibility and documentation quality.
The headlines of this release are:
fish
shell has been added.loongarch64-unknown-linux-gnu
host platform has been added.Also, it's worth mentioning that Dirkjan Ochtman and rami3l have joined the team and are coordinating this new release.
Finally, the project seems to have attracted a total of 23 new contributors within this release cycle. Looking forward to seeing you again in the future!
Added
fish
shell pr#3108RUSTUP_TERM_COLOR
environment variable to force the use of colored output pr#3435rustup-init.sh
's compatibility withksh
andzsh
pr#3475Changed
clap
to v4 pr#3444component list --toolchain stable
pr#3548llvm-tools-preview
component tollvm-tools
pr#3578Thanks go to:
Full Changelog: 1.26.0...1.27.0