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

Fix try builds on the msvc builder #113226

Merged
merged 2 commits into from
Jul 1, 2023
Merged

Fix try builds on the msvc builder #113226

merged 2 commits into from
Jul 1, 2023

Conversation

lqd
Copy link
Member

@lqd lqd commented Jul 1, 2023

Try builds have been optimized to build less components, however bootstrap was still expecting them to be present on msvc. This PR (extracted from #112267) fixes that.

r? @Kobzol

lqd added 2 commits July 1, 2023 07:55
The windows tarballs and installers expect clippy to be present, but
it's not always the case. For example, in try builds.
The windows tarballs and installers expect rust-analyzer to be present, but
it's not always the case. For example, in try builds.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 1, 2023
@Kobzol
Copy link
Contributor

Kobzol commented Jul 1, 2023

To provide more context for others: try builds are not actually normally executed on msvc, but sometimes we enable them manually to test e.g. the PGO build script or the performance of optimized windows dist builds. That's why it would be nice for it to actually work for try builds. Maybe in the future, with the new bors, we will be able to run a try build on Windows with a simple command.

Part of the code already checked before if rust-analyzer is present, so this also seems like a bugfix (it checked at some places, but not all of them).

I tested on #112235 that this does indeed fix msvc try builds.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 1, 2023

📌 Commit a158053 has been approved by Kobzol

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 Jul 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 1, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113168 (fix(resolve): skip assertion judgment when NonModule is dummy)
 - rust-lang#113174 (Better messages for next on a iterator inside for loops)
 - rust-lang#113182 (Error when RPITITs' hidden types capture more lifetimes than their trait definitions)
 - rust-lang#113196 (Fix associated items effective visibility calculation for type privacy lints)
 - rust-lang#113226 (Fix try builds on the msvc builder)
 - rust-lang#113227 (Update cargo)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f607eb4 into rust-lang:master Jul 1, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 1, 2023
@lqd lqd deleted the win-trys branch July 1, 2023 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants