Skip to content

bootstrap: don't build book redirect pages during dry-run/test - #147374

Merged
bors merged 1 commit into
rust-lang:masterfrom
jieyouxu:bootstrap-redirect-pages
Oct 5, 2025
Merged

bootstrap: don't build book redirect pages during dry-run/test#147374
bors merged 1 commit into
rust-lang:masterfrom
jieyouxu:bootstrap-redirect-pages

Conversation

@jieyouxu

@jieyouxujieyouxu commented Oct 5, 2025

Copy link
Copy Markdown
Member

Currently, ./x test bootstrap does not automatically transitively checkout submodules needed to pass all involved test steps. Apparently one place where bootstrap's self-test can choke on locally is trying to build book redirect pages without the book submodules checked out.

This change is orthogonal to making bootstrap checking out required submodules for self-tests, and IMO is beneficial regardless since IMO we should not be building these redirect pages during test/dry-run anyway.

This was blocking me trying to rebless bootstrap self-tests for #147372. cf. #t-infra/bootstrap > Bootstrap self-tests @ 💬.

r? @Kobzol (or bootstrap)

@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 Oct 5, 2025
@Kobzol

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Oct 5, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 25216f8 has been approved by Kobzol

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 Oct 5, 2025
@rust-log-analyzer

This comment has been minimized.

@Kobzol

Copy link
Copy Markdown
Member

@bors r-

@borsbors 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 Oct 5, 2025
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Huh

@jieyouxu

Copy link
Copy Markdown
MemberAuthor

I guess that changes the ordering if rustdoc only needs to be built later...

@jieyouxu
jieyouxuforce-pushed the bootstrap-redirect-pages branch from 25216f8 to 7ed476fCompareOctober 5, 2025 12:18
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Let's wait for PR CI just in case there's another difference

@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Green enough.
@bors r=Kobzol rollup

@bors

bors commented Oct 5, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 7ed476f has been approved by Kobzol

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 5, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Oct 5, 2025
…f-test, r=Kobzol
bootstrap: relax `compiler-rt` root assertion
Not needed during tests. This would otherwise require `src/llvm-project` submodule to be initialized and `compiler-rt/` subdirectory to be present.
I need this and rust-lang#147374 to get bootstrap self-tests to pass with no git submodules checked out locally.
r? `@Kobzol` (or bootstrap)
bors added a commit that referenced this pull request Oct 5, 2025
Rollup of 4 pull requests
Successful merges:
- #147327 (cg_llvm: Remove inherent methods from several LLVM FFI types)
- #147332 (Set opt-level flag for installing tool only on CI)
- #147374 (bootstrap: don't build book redirect pages during dry-run/test)
- #147376 (bootstrap: relax `compiler-rt` root assertion)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit aa37ad4 into rust-lang:masterOct 5, 2025
10 checks passed
rust-timer added a commit that referenced this pull request Oct 5, 2025
Rollup merge of #147376 - jieyouxu:bootstrap-compiler-rt-self-test, r=Kobzol
bootstrap: relax `compiler-rt` root assertion
Not needed during tests. This would otherwise require `src/llvm-project` submodule to be initialized and `compiler-rt/` subdirectory to be present.
I need this and #147374 to get bootstrap self-tests to pass with no git submodules checked out locally.
r? `@Kobzol` (or bootstrap)
@rustbotrustbot added this to the 1.92.0 milestone Oct 5, 2025
rust-timer added a commit that referenced this pull request Oct 5, 2025
Rollup merge of #147374 - jieyouxu:bootstrap-redirect-pages, r=Kobzol
bootstrap: don't build book redirect pages during dry-run/test
Currently, `./x test bootstrap` does not automatically transitively checkout submodules needed to pass all involved test steps. Apparently one place where bootstrap's self-test can choke on locally is trying to build book redirect pages without the book submodules checked out.
This change is orthogonal to making bootstrap checking out required submodules for self-tests, and IMO is beneficial regardless since IMO we should not be building these redirect pages during test/dry-run _anyway_.
This was blocking me trying to rebless bootstrap self-tests for #147372. cf. [#t-infra/bootstrap > Bootstrap self-tests @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Bootstrap.20self-tests/near/543157194).
r? `@Kobzol` (or bootstrap)
@jieyouxu
jieyouxu deleted the bootstrap-redirect-pages branch October 6, 2025 06:29
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.

5 participants

@jieyouxu@Kobzol@bors@rust-log-analyzer@rustbot