Skip to content

bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt - #129000

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-bootstrap-clear
Aug 13, 2024
Merged

bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt#129000
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri-bootstrap-clear

Conversation

@RalfJung

@RalfJungRalfJung commented Aug 12, 2024

Copy link
Copy Markdown
Member

Second attempt after #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

@rustbotrustbot 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 12, 2024
@RalfJung
RalfJungforce-pushed the miri-bootstrap-clear branch from fafb64e to 6839a8fCompareAugust 12, 2024 10:12
@onur-ozkan

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 12, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 6839a8f has been approved by onur-ozkan

It is now in the queue for this repository.

@borsbors 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 12, 2024
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`
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
…iaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#128712 (Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver)
- rust-lang#128861 (Rework MIR inlining debuginfo so function parameters show up in debuggers.)
- rust-lang#128912 (Store `do_not_recommend`-ness in impl header)
- rust-lang#129000 (bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt)
- rust-lang#129013 (Remove unused script from run-make tests)
- rust-lang#129017 (Replace `std::fmt:FormatterFn` with `std::fmt::from_fn`)
Failed merges:
- rust-lang#128935 (More work on `zstd` compression)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2024
…iaskrgr
Rollup of 5 pull requests
Successful merges:
- rust-lang#128712 (Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver)
- rust-lang#128912 (Store `do_not_recommend`-ness in impl header)
- rust-lang#129000 (bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt)
- rust-lang#129013 (Remove unused script from run-make tests)
- rust-lang#129017 (Replace `std::fmt:FormatterFn` with `std::fmt::from_fn`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 301a4ca into rust-lang:masterAug 13, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 13, 2024
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``
@RalfJung
RalfJung deleted the miri-bootstrap-clear branch August 14, 2024 12:15
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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.

4 participants

@RalfJung@onur-ozkan@bors@rustbot