Skip to content

do not build cargo-miri by default on stable channel - #129243

Merged
bors merged 2 commits into
rust-lang:masterfrom
onur-ozkan:stuff
Aug 23, 2024
Merged

do not build cargo-miri by default on stable channel#129243
bors merged 2 commits into
rust-lang:masterfrom
onur-ozkan:stuff

Conversation

@onur-ozkan

Copy link
Copy Markdown
Contributor

Skips cargo-miri build on stable channel just like miri.

Closes#129171

cc @RalfJung

@rustbot

Copy link
Copy Markdown
Collaborator

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

@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 18, 2024
@rustbot

Copy link
Copy Markdown
Collaborator

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@bors

bors commented Aug 19, 2024

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #128588) made this pull request unmergeable. Please resolve the merge conflicts.

miri skipped for stable channel by default, do the same for `cargo-miri`.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@Kobzol

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Aug 23, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 0ce7705 has been approved by Kobzol

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 23, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 23, 2024
do not build `cargo-miri` by default on stable channel
Skips `cargo-miri` build on `stable` channel just like `miri`.
Closesrust-lang#129171
cc `@RalfJung`
This was referenced Aug 23, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
…llaumeGomez
Rollup of 9 pull requests
Successful merges:
- rust-lang#128511 (Document WebAssembly target feature expectations)
- rust-lang#129243 (do not build `cargo-miri` by default on stable channel)
- rust-lang#129263 (Add a missing compatibility note in the 1.80.0 release notes)
- rust-lang#129276 (Stabilize feature `char_indices_offset`)
- rust-lang#129350 (adapt integer comparison tests for LLVM 20 IR changes)
- rust-lang#129408 (Fix handling of macro arguments within the `dropping_copy_types` lint)
- rust-lang#129426 (rustdoc-search: use tighter json for names and parents)
- rust-lang#129437 (Fix typo in a help diagnostic)
- rust-lang#129457 (kobzol vacation)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit e5cd26a into rust-lang:masterAug 23, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
Rollup merge of rust-lang#129243 - onur-ozkan:stuff, r=Kobzol
do not build `cargo-miri` by default on stable channel
Skips `cargo-miri` build on `stable` channel just like `miri`.
Closesrust-lang#129171
cc ``@RalfJung``
@onur-ozkan
onur-ozkan deleted the stuff branch August 30, 2024 14:36
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.

Include miri in config.example.toml[build] # tools=

4 participants

@onur-ozkan@rustbot@bors@Kobzol