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.

Sign up for GitHub

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

Jump to bottom

bump miri #65594

Merged
merged 2 commits into from
Oct 21, 2019
Merged

bump miri #65594

merged 2 commits into from
Oct 21, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 19, 2019 •
edited
Loading

Fixes #65529

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2019
@RalfJung
Copy link
Member Author

Self-r+ because this just bumps a submodule; p=1 because it fixes Miri's toolstate.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 19, 2019

📌 Commit fac34eb has been approved by RalfJung

@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 Oct 19, 2019
@bors
Copy link
Contributor

bors commented Oct 19, 2019

⌛ Testing commit fac34eb with merge 131aa1157a7c990dfe7513f4406a15041ce01312...

Centril added a commit to Centril/rust that referenced this pull request Oct 19, 2019
@Centril
Rollup merge of rust-lang#65594 - RalfJung:miri, r=RalfJung
a9d40b4 
bump miri

Fixes rust-lang#65529
@Centril Centril mentioned this pull request Oct 19, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Oct 19, 2019

@bors retry rolled up.

@bors
Copy link
Contributor

bors commented Oct 19, 2019

⌛ Testing commit fac34eb with merge 1a396431314a2c4f6969c103ef755ea9fbba01b9...

@RalfJung
Copy link
Member Author

PR CI failed.

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 19, 2019
@Centril
Copy link
Contributor

Centril commented Oct 19, 2019

@bors r- retry

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 19, 2019
@RalfJung
Copy link
Member Author

Had to adjust the bootstrap logic to account for rust-lang/miri#980, so this should get a second pair of eyes I think.

r? @oli-obk

oli-obk
oli-obk reviewed Oct 19, 2019
View reviewed changes
src/bootstrap/test.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Oct 19, 2019

bors r+ p=1

@RalfJung
Copy link
Member Author

bors r+ p=1

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Oct 19, 2019

📌 Commit c3f76ffca60bf3930f7931157335fd99f46e5bbb has been approved by oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Oct 19, 2019

@bors p=1

@RalfJung
Copy link
Member Author

Okay I'll implement a --print-sysroot then.

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 19, 2019
@RalfJung
Copy link
Member Author

All right I think that should do it.

@RalfJung RalfJung 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 Oct 20, 2019
@RalfJung
Copy link
Member Author

Tests pass locally. @oli-obk I think this is a better approach; please review. :)

@oli-obk
Copy link
Contributor

oli-obk commented Oct 21, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 21, 2019

📌 Commit 5192daf has been approved by oli-obk

@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 Oct 21, 2019
@bors
Copy link
Contributor

bors commented Oct 21, 2019

⌛ Testing commit 5192daf with merge b7a9c28...

bors added a commit that referenced this pull request Oct 21, 2019
@bors
Auto merge of #65594 - RalfJung:miri, r=oli-obk
b7a9c28 
bump miri

Fixes #65529
@bors bors mentioned this pull request Oct 21, 2019
Merged
@bors
Copy link
Contributor

bors commented Oct 21, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing b7a9c28 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2019
@bors bors merged commit 5192daf into rust-lang:master Oct 21, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #65594!

Tested on commit b7a9c28.
Direct link to PR: #65594

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 21, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#65594!
67d1195 
Tested on commit rust-lang/rust@b7a9c28.
Direct link to PR: <rust-lang/rust#65594>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
@RalfJung RalfJung deleted the miri branch October 22, 2019 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#65495
6 participants
@RalfJung @rust-highfive @bors @Centril @oli-obk @alexcrichton