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.

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

bootstrap: clear miri's ui test deps when rustc changes #128683

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Aug 5, 2024

@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.

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2024

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

@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 Aug 5, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Aug 5, 2024

r? @onur-ozkan

@rustbot rustbot assigned onur-ozkan and unassigned Kobzol Aug 5, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Aug 5, 2024

rust-lang/miri#3790 makes us use a Miri-specific folder.

@onur-ozkan onur-ozkan 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Aug 7, 2024

@rustbot ready

@rustbot rustbot added S-waiting-on-review 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 Aug 7, 2024
@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 7, 2024

📌 Commit 2b584dc has been approved by onur-ozkan

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 Aug 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#128206 (Make create_dll_import_lib easier to implement)
 - rust-lang#128424 (minor `effects` cleanups)
 - 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-ffi` `run-make` test to rmake)
 - rust-lang#128753 (Don't arbitrarily choose one upper bound for hidden captured region error message)
 - rust-lang#128757 (Migrate `pgo-gen-lto` `run-make` test 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
@bors bors merged commit 37dfe41 into rust-lang:master Aug 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
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.
@RalfJung RalfJung deleted the miri-ui-test-deps branch August 8, 2024 09:59
@RalfJung
Copy link
Member Author

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...

@onur-ozkan
Copy link
Member

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 Aug 12, 2024
…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 Aug 12, 2024
…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 Aug 12, 2024
…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 Aug 13, 2024
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``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

5 participants