bootstrap: don't build book redirect pages during dry-run/test #147374
+8
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
|
@bors r- |
bors
added
S-waiting-on-author
|
Huh |
|
I guess that changes the ordering if |
jieyouxu
force-pushed
the
bootstrap-redirect-pages
branch
from
25216f8 to
7ed476f
Compare
|
Let's wait for PR CI just in case there's another difference |
|
Green enough. |
bors
added
S-waiting-on-bors
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
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)
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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently,
./x test bootstrapdoes 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)