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.

Sign up for GitHub

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

Jump to bottom

Prepare 1.85 beta release #135163

Merged
merged 6 commits into from
Jan 8, 2025
Merged

Prepare 1.85 beta release #135163

merged 6 commits into from
Jan 8, 2025

Conversation

pietroalbini
Copy link
Member

r? @ghost

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 6, 2025
@pietroalbini
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Jan 6, 2025

📌 Commit eb92cef has been approved by pietroalbini

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 6, 2025
@bors
Copy link
Contributor

bors commented Jan 6, 2025

⌛ Testing commit eb92cef with merge 65deadf...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2025
@bors
Auto merge of rust-lang#135163 - pietroalbini:pa-beta, r=pietroalbini
65deadf 
Prepare 1.85 beta release

r? `@ghost`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 6, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 6, 2025
@pietroalbini
Copy link
Member Author

Turns out that replace-version-placeholder replaced... where the placeholder itself is defined. Unsurprisingly things were sad.

Manually removed the broken replacement from the commit, will send a tooling change later.

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Jan 6, 2025

📌 Commit f1ac628 has been approved by pietroalbini

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 6, 2025
@pietroalbini
Copy link
Member Author

@bors rollup=never

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member

cuviper commented Jan 6, 2025

You should also include #135034 here, as you did in #135162.

@pietroalbini
Copy link
Member Author

@bors r-

PR CI failed. Will investigate.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 6, 2025
@bors
Copy link
Contributor

bors commented Jan 6, 2025

⌛ Testing commit f1ac628 with merge 58a4996...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2025
@bors
Auto merge of rust-lang#135163 - pietroalbini:pa-beta, r=
58a4996 
Prepare 1.85 beta release

r? `@ghost`
@pietroalbini
Copy link
Member Author

Congrats bors you're broken.

@bors retry

@bors
Copy link
Contributor

bors commented Jan 7, 2025

📌 Commit 3d6fdff has been approved by pietroalbini

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2025
@bors
Auto merge of rust-lang#135163 - pietroalbini:pa-beta, r=pietroalbini
fd27cb9 
Prepare 1.85 beta release

r? `@ghost`
@bors
Copy link
Contributor

bors commented Jan 7, 2025

⌛ Testing commit 3d6fdff with merge fd27cb9...

@Urgau Urgau mentioned this pull request Jan 7, 2025
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 7, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 7, 2025
@Urgau
Copy link
Member

Urgau commented Jan 7, 2025

The job dist-i686-msvc failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)

RustFmtGroup.wxs
RustAnalyzerGroup.wxs
AnalysisGroup.wxs
building `msi` installer with "D:/a/rust/rust/wix\\bin/light.exe"
D:\a\rust\rust\build\tmp\dist\combined-tarball\rust.wxs(306) : error LGHT0094 : Unresolved reference to symbol 'WixComponentGroup:MiriGroup' in section 'Product:*'.
Command has failed. Rerun with -v to see more details.

Same error as the one encountered when preparing the previous beta version, #133447 (comment)

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jan 8, 2025
@pietroalbini
Copy link
Member Author

Reverted #131365

@bors r+ p=100 rollup=never

@bors
Copy link
Contributor

bors commented Jan 8, 2025

📌 Commit b2ab974 has been approved by pietroalbini

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2025
@bors
Copy link
Contributor

bors commented Jan 8, 2025

⌛ Testing commit b2ab974 with merge e30eeff...

@bors
Copy link
Contributor

bors commented Jan 8, 2025

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing e30eeff to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2025
@bors bors merged commit e30eeff into rust-lang:beta Jan 8, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 8, 2025
@pietroalbini pietroalbini deleted the pa-beta branch January 8, 2025 12:52
@pietroalbini pietroalbini mentioned this pull request Jan 8, 2025
Merged
@klensy klensy mentioned this pull request Jan 8, 2025
Open
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 8, 2025
@matthiaskrgr
Rollup merge of rust-lang#135253 - pietroalbini:pa-revert-131365, r=M…
6a093f7 
…ark-Simulacrum

Revert rust-lang#131365

This PR reverts rust-lang#131365, following the revert we did on the beta branches for both 1.84 and 1.85.

While the PR passes CI successfully on master, as soon as we branch off beta it starts failing in the newly created beta branch. This caused the release team to revert it for both 1.84 and 1.85, and if nothing is done it would continue being reverted every cycle.

`@heiseish` (PR author) feel free to submit the PR again in the future: this revert doesn't represent the release team rejecting your change, but just a (hopefully temporary!) revert to ensure future beta branches can be created without reverting it each time.

When submitting the PR again, I recommend you test your changes by configuring `rust.channel` to both `nightly` and `beta` in your `config.toml`. You can see the latest failure [here](rust-lang#135163 (comment)).
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
@rust-timer
Unrolled build for rust-lang#135253
98b185f 
Rollup merge of rust-lang#135253 - pietroalbini:pa-revert-131365, r=Mark-Simulacrum

Revert rust-lang#131365

This PR reverts rust-lang#131365, following the revert we did on the beta branches for both 1.84 and 1.85.

While the PR passes CI successfully on master, as soon as we branch off beta it starts failing in the newly created beta branch. This caused the release team to revert it for both 1.84 and 1.85, and if nothing is done it would continue being reverted every cycle.

`@heiseish` (PR author) feel free to submit the PR again in the future: this revert doesn't represent the release team rejecting your change, but just a (hopefully temporary!) revert to ensure future beta branches can be created without reverting it each time.

When submitting the PR again, I recommend you test your changes by configuring `rust.channel` to both `nightly` and `beta` in your `config.toml`. You can see the latest failure [here](rust-lang#135163 (comment)).
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 9, 2025
@matthiaskrgr
Rollup merge of rust-lang#135221 - Urgau:replace-in-stable-book, r=pi…
29c17fc 
…etroalbini

Include rustc and rustdoc book in replace-version-placeholder

This PR includes the *(stable)* rustc and rustdoc books which might contain `CURRENT_RUSTC_VERSION` that should be replaced when branching beta. Include them so they are not forgotten.

I didn't include any other folder or books as they don't strike me as relevant for it and might be problematic in the future if some of the submodules are turned into subtree, because we have places where we wouldn't want to replace them.

cf. rust-lang#135163 (comment)
cc `@pietroalbini`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
@rust-timer
Unrolled build for rust-lang#135221
53e8139 
Rollup merge of rust-lang#135221 - Urgau:replace-in-stable-book, r=pietroalbini

Include rustc and rustdoc book in replace-version-placeholder

This PR includes the *(stable)* rustc and rustdoc books which might contain `CURRENT_RUSTC_VERSION` that should be replaced when branching beta. Include them so they are not forgotten.

I didn't include any other folder or books as they don't strike me as relevant for it and might be problematic in the future if some of the submodules are turned into subtree, because we have places where we wouldn't want to replace them.

cf. rust-lang#135163 (comment)
cc `@pietroalbini`
@wesleywiser wesleywiser mentioned this pull request Jan 9, 2025
Closed
@cuviper cuviper mentioned this pull request Jan 10, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
8 participants
@pietroalbini @bors @rust-log-analyzer @cuviper @rustbot @Urgau @jieyouxu @Noratrieb