Make the config.src handling for downloadable bootstrap more conservative#102581
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 9, 2022
Merged
Make the config.src handling for downloadable bootstrap more conservative#102581bors merged 1 commit intorust-lang:masterfrom
config.src handling for downloadable bootstrap more conservative#102581bors merged 1 commit intorust-lang:masterfrom
Conversation
…re conservative In particular, this supports build directories within an unrelated git repository. As a side effect, it will fall back to the old logic when the source directory is being built from a tarball within an unrelated git repository. However, that second case is unsupported and untested; we reserve the right to break it in the future.
Contributor
|
@jyn514 This PR fixes the build issues on my end :D! |
Member
|
@bors r+ rollup |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 8, 2022
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#99194 (Fix gdb-cmd for rust-gdbgui) - rust-lang#99880 (`EscapeAscii` is not an `ExactSizeIterator`) - rust-lang#102524 (rustdoc: remove weird `<a href="#">` wrapper around unsafe triangle) - rust-lang#102581 (Make the `config.src` handling for downloadable bootstrap more conservative) - rust-lang#102604 (Improve readability of bootstrap's README) - rust-lang#102723 (test: run-make: skip when cross-compiling) - rust-lang#102815 (rustdoc: remove mobile topbar from source pages instead of hiding it) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
In particular, this supports build directories within an unrelated git repository. Fixes #102562.
As a side effect, it will fall back to the old logic when the source directory is being built from a tarball within an unrelated git repository. However, that second case is unsupported and untested; we reserve the right to break it in the future.
@cr1901 can you confirm this fixes your problem?
cc @kleisauke, I believe this will also fix your issue (although your use case still isn't supported).
r? @Mark-Simulacrum