bootstrap: clear miri's ui test deps when rustc changes by RalfJung · Pull Request #128683 · rust-lang/rust (original) (raw)
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.
By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation10 Commits1 Checks6 Files changed
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
[ Show hidden characters]({{ revealButtonHref }})
@onur-ozkan I hope this makes sense... it's quite hard to test this, but it did at least cause one rebuild of the right files for me, and then it doesn't seem to keep rebuilding, so at first sight this look at least better than the status quo.
r? @Kobzol
rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
📌 Commit 2b584dc has been approved by onur-ozkan
It is now in the queue for this repository.
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
bors added a commit to rust-lang-ci/rust that referenced this pull request
…llaumeGomez
Rollup of 9 pull requests
Successful merges:
- rust-lang#128206 (Make create_dll_import_lib easier to implement)
- rust-lang#128424 (minor
effectscleanups) - rust-lang#128527 (More information for fully-qualified suggestion when there are multiple impls)
- rust-lang#128656 (Enable msvc for run-make/rust-lld)
- rust-lang#128683 (bootstrap: clear miri's ui test deps when rustc changes)
- rust-lang#128700 (Migrate
simd-ffirun-maketest to rmake) - rust-lang#128753 (Don't arbitrarily choose one upper bound for hidden captured region error message)
- rust-lang#128757 (Migrate
pgo-gen-ltorun-maketest to rmake) - rust-lang#128758 (Specify a minimum supported version for VxWorks)
Failed merges:
- rust-lang#128679 (codegen: better centralize function declaration attribute computation)
r? @ghost
@rustbot modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#128683 - RalfJung:miri-ui-test-deps, r=onur-ozkan
bootstrap: clear miri's ui test deps when rustc changes
@onur-ozkan I hope this makes sense... it's quite hard to test this, but it did at least cause one rebuild of the right files for me, and then it doesn't seem to keep rebuilding, so at first sight this look at least better than the status quo.
I'm afraid only clearing when rustc changes isn't enough... we need to also clear whenever the Miri sysroot gets rebuilt. Cargo doesn't seem to recognize that the standard library changes, and then we still get build failures as before.
I don't know a good way to implement that, though...
We could clear it unconditionally in a similar way to how we handle docs:
| if cmd_kind == Kind::Doc { |
|---|
| let my_out = match mode { |
| // This is the intended out directory for compiler documentation. |
| Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target), |
| Mode::Std => { |
| if self.config.cmd.json() { |
| out_dir.join(target.triple).join("json-doc") |
| } else { |
| out_dir.join(target.triple).join("doc") |
| } |
| } |
| _ => panic!("doc mode {mode:?} not expected"), |
| }; |
| let rustdoc = self.rustdoc(compiler); |
| self.clear_if_dirty(&my_out, &rustdoc); |
| } |
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…nur-ozkan
bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt
Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing.
I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked.
r? @onur-ozkan
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…nur-ozkan
bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt
Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing.
I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked.
r? @onur-ozkan
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
…nur-ozkan
bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt
Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing.
I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked.
r? @onur-ozkan
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#129000 - RalfJung:miri-bootstrap-clear, r=onur-ozkan
bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt
Second attempt after rust-lang#128683: seems like it's not the compiler changing that we care about, but the sysroot changing.
I did some local testing with sysroot rebuilds and it works fine for at least those cases I checked.
r? @onur-ozkan
Labels
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)