Uh oh!
There was an error while loading. Please reload this page.
bootstrap: clear miri's ui test deps when rustc changes - #128683
Merged
Conversation
rustbot
commented
Aug 5, 2024
Collaborator
Uh oh!
There was an error while loading. Please reload this page.
Kobzol
commented
Aug 5, 2024
Member
r? @onur-ozkan |
RalfJung
commented
Aug 5, 2024
MemberAuthor
rust-lang/miri#3790 makes us use a Miri-specific folder. |
RalfJungforce-pushed
the
miri-ui-test-deps
branch
from
August 7, 2024 12:38
a4ed764 to
2b584dcCompareRalfJung
commented
Aug 7, 2024
MemberAuthor
@rustbot ready |
onur-ozkan
commented
Aug 7, 2024
Contributor
@bors r+ rollup |
bors
commented
Aug 7, 2024
Collaborator
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
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
commented
Aug 10, 2024
MemberAuthor
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
commented
Aug 11, 2024
Contributor
We could clear it unconditionally in a similar way to how we handle docs: rust/src/bootstrap/src/core/builder.rs Lines 1495 to 1510 in 730d5d4 |
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``
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 freeto 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.
@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.