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

Download beta compiler toolchain in bootstrap if it doesn't yet exist #109448

Merged
merged 1 commit into from
Apr 8, 2023

Conversation

onur-ozkan
Copy link
Member

Blocker for #107812 and #99989

See: #107812 (comment)

r? @jyn514

@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 Mar 21, 2023
@jyn514
Copy link
Member

jyn514 commented Mar 21, 2023

Feels a little not in the spirit of things for me to review my own commit 😆

r? bootstrap

@rustbot rustbot assigned Mark-Simulacrum and unassigned jyn514 Mar 21, 2023
@Mark-Simulacrum
Copy link
Member

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 2, 2023
@onur-ozkan onur-ozkan force-pushed the download-beta-compiler-toolchain branch from a9f596b to cc8c916 Compare April 2, 2023 18:07
@onur-ozkan onur-ozkan added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 2, 2023
@onur-ozkan onur-ozkan force-pushed the download-beta-compiler-toolchain branch from cc8c916 to 6f8e470 Compare April 2, 2023 18:24
@onur-ozkan
Copy link
Member Author

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Apr 2, 2023

📌 Commit 6f8e470 has been approved by Mark-Simulacrum

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 Apr 2, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 2, 2023
…oolchain, r=Mark-Simulacrum

Download beta compiler toolchain in bootstrap if it doesn't yet exist

Blocker for rust-lang#107812 and rust-lang#99989

See: rust-lang#107812 (comment)

r? `@jyn514`
@ehuss
Copy link
Contributor

ehuss commented Apr 3, 2023

@bors r-

Failed in rollup: #109872 (comment)

@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 Apr 3, 2023
@onur-ozkan
Copy link
Member Author

onur-ozkan commented Apr 3, 2023

We are having problem at https://github.com/ozkanonur/rust/blob/6f8e47092cfbfbc944db848928bc92ca982041ea/src/bootstrap/download.rs#L421-L423 due to race condition on Windows platform.

I don't really want to add another dependency for Windows in bootstrap:( What if we don't remove the bin_root and leave it as it is, can't overriding files and dirs work here? @jyn514

for extra information, see:

@onur-ozkan onur-ozkan added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 3, 2023
@ChrisDenton
Copy link
Member

I'm not sure that adding another dependency would help. This looks like a more fundamental issue. A process in the directory is still running (maybe bootstrap itself?) and this will prevent deletion.

@onur-ozkan
Copy link
Member Author

Oh, I thought completely different stuff.

By roughly looking on the changes, the problem is seems like we are trying to remove stage0 while using it.

@onur-ozkan onur-ozkan 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 3, 2023
@onur-ozkan onur-ozkan force-pushed the download-beta-compiler-toolchain branch from 6f8e470 to c2d9d58 Compare April 7, 2023 15:43
src/bootstrap/download.rs Outdated Show resolved Hide resolved
@onur-ozkan onur-ozkan force-pushed the download-beta-compiler-toolchain branch 2 times, most recently from 2efee53 to 71680ef Compare April 7, 2023 18:05
src/bootstrap/download.rs Outdated Show resolved Hide resolved
This is needed for when the shell scripts bypass python altogether and run the downloaded
bootstrap directly. Changes are mainly provided from @jyn514, I just fixed the review notes.

Signed-off-by: ozkanonur <work@onurozkan.dev>
@onur-ozkan onur-ozkan force-pushed the download-beta-compiler-toolchain branch from 71680ef to eeec732 Compare April 7, 2023 21:31
@onur-ozkan
Copy link
Member Author

@bors r=Mark-Simulacrum rollup=iffy

@bors
Copy link
Contributor

bors commented Apr 7, 2023

📌 Commit eeec732 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 7, 2023
@bors
Copy link
Contributor

bors commented Apr 7, 2023

⌛ Testing commit eeec732 with merge ba86600...

@bors
Copy link
Contributor

bors commented Apr 8, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing ba86600 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 8, 2023
@bors bors merged commit ba86600 into rust-lang:master Apr 8, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 8, 2023
@onur-ozkan onur-ozkan deleted the download-beta-compiler-toolchain branch April 8, 2023 01:09
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ba86600): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants