Skip to content

Fix bootstrap locking - #110485

Merged
bors merged 1 commit into
rust-lang:masterfrom
albertlarsan68:fix-bootstrap-lock
Apr 18, 2023
Merged

Fix bootstrap locking#110485
bors merged 1 commit into
rust-lang:masterfrom
albertlarsan68:fix-bootstrap-lock

Conversation

@albertlarsan68

@albertlarsan68albertlarsan68 commented Apr 18, 2023

Copy link
Copy Markdown
Member

Fix the regression introduced in #108607

Fixes#109967

Fix the regression introduced in 108607
@rustbot

Copy link
Copy Markdown
Collaborator

r? @ozkanonur

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

@rustbotrustbot 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
Comment threadsrc/bootstrap/bin/main.rs
@onur-ozkan

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Apr 18, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit ce5d897 has been approved by ozkanonur

It is now in the queue for this repository.

@borsbors 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:masterApr 18, 2023
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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

@albertlarsan68@rustbot@onur-ozkan@bors