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 bootstrap locking #110485

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Conversation

albertlarsan68
Copy link
Member

@albertlarsan68 albertlarsan68 commented Apr 18, 2023

Fix the regression introduced in #108607

Fixes #109967

Fix the regression introduced in 108607
@rustbot
Copy link
Collaborator

rustbot commented Apr 18, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

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

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit ce5d897 has been approved by ozkanonur

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

Rollup of 5 pull requests

Successful merges:

 - rust-lang#110417 (Spelling compiler)
 - rust-lang#110441 (5 little typos)
 - rust-lang#110485 (Fix bootstrap locking)
 - rust-lang#110488 (Add a failing rustdoc-ui test for public infinite recursive type)
 - rust-lang#110490 (Bump `download-ci-llvm-stamp` for loong support)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit aa1247a into rust-lang:master Apr 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 18, 2023
@albertlarsan68 albertlarsan68 deleted the fix-bootstrap-lock branch April 26, 2023 15:54
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.

bootstrap: build locking doesn't work any more
4 participants