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

bootstrap: add .gitmodules to the sources #111201

Merged
merged 1 commit into from
May 4, 2023
Merged

bootstrap: add .gitmodules to the sources #111201

merged 1 commit into from
May 4, 2023

Conversation

krasimirgg
Copy link
Contributor

The bootstrap builder now expects this file to exist:

rust/src/bootstrap/builder.rs

Line 494 in 6f8c055

let file = File::open(src.join(".gitmodules")).unwrap();

Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/missing.20llvm-project.2Fruntimes.20in.20beta.20srcs

@rustbot
Copy link
Collaborator

rustbot commented May 4, 2023

r? @Mark-Simulacrum

(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 May 4, 2023
@krasimirgg
Copy link
Contributor Author

r? @jyn514

@rustbot rustbot assigned jyn514 and unassigned Mark-Simulacrum May 4, 2023
@krasimirgg krasimirgg marked this pull request as ready for review May 4, 2023 13:11
@jyn514
Copy link
Member

jyn514 commented May 4, 2023

r=me with CI passing (use @bors r=jyn514)

@bors delegate=krasimirgg rollup

@bors
Copy link
Contributor

bors commented May 4, 2023

📌 Commit 6530b1b has been approved by jyn514)`

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 May 4, 2023
@bors
Copy link
Contributor

bors commented May 4, 2023

✌️ @krasimirgg can now approve this pull request

@jyn514
Copy link
Member

jyn514 commented May 4, 2023

that is uhhhh several bugs in bors

@bors r-

@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 May 4, 2023
@albertlarsan68
Copy link
Member

@bors r=jyn514

@bors
Copy link
Contributor

bors commented May 4, 2023

📌 Commit 6530b1b has been approved by jyn514

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 May 4, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request May 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2023
@bors
Auto merge of rust-lang#111210 - matthiaskrgr:rollup-doquh2n, r=matth…
eb7a743 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#108865 (Add a `sysroot` crate to represent the standard library crates)
 - rust-lang#110651 (libtest: include test output in junit xml reports)
 - rust-lang#110826 (Make PlaceMention a non-mutating use.)
 - rust-lang#110982 (Do not recurse into const generic args when resolving self lifetime elision.)
 - rust-lang#111009 (Add `ascii::Char` (ACP#179))
 - rust-lang#111100 (check array type of repeat exprs is wf)
 - rust-lang#111186 (Add `is_positive` method for signed non-zero integers.)
 - rust-lang#111201 (bootstrap: add .gitmodules to the sources)

Failed merges:

 - rust-lang#110954 (Reject borrows of projections in ConstProp.)

r? `@ghost`
`@rustbot` modify labels: rollup
@stefson
Copy link

stefson commented May 4, 2023

please backport with the fix you might come up for this to beta branch, compiling beta is broken at the moment if you use the upstream tarballs.

@jyn514 jyn514 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 4, 2023
@bors bors merged commit 75e8f87 into rust-lang:master May 4, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 4, 2023
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels May 6, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.71.0, 1.70.0 May 6, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 7, 2023
@bors
Auto merge of rust-lang#111290 - Mark-Simulacrum:beta-backport, r=Mar…
2013813 
…k-Simulacrum

[beta] backport

This PR backports:

- rust-lang#111015: Remove wrong assertion in match checking.
- rust-lang#110917: only error combining +whole-archive and +bundle for rlibs
- rust-lang#111201: bootstrap: add .gitmodules to the sources

r? `@Mark-Simulacrum`
@matthiaskrgr matthiaskrgr mentioned this pull request May 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jyn514 jyn514

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@krasimirgg @rustbot @jyn514 @bors @albertlarsan68 @stefson @Mark-Simulacrum