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

update Miri #71343

Merged
merged 1 commit into from
Apr 23, 2020
Merged

update Miri #71343

merged 1 commit into from
Apr 23, 2020

Conversation

RalfJung
Copy link
Member

Fixes #71241
r? @ghost Cc @rust-lang/miri

@RalfJung
Copy link
Member Author

Actually #71280 will break Miri again so probably it is better to wait until that lands.

@Dylan-DPC-zz Dylan-DPC-zz added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Apr 20, 2020
@RalfJung
Copy link
Member Author

Well, not sure when that PR is going to get reviewed, so I guess let's fix Miri in the mean time. The bors queue is pretty empty anyway.
@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 21, 2020

📌 Commit e4e33b50196542a802c20158d78abf876dfb8f7a 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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Apr 21, 2020
@RalfJung
Copy link
Member Author

Ah, but #71170 could also have some interesting interactions. Let's wait for that.
@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 Apr 21, 2020
@RalfJung
Copy link
Member Author

#71170 landed, and all looks good.
@bors r+

@bors
Copy link
Contributor

bors commented Apr 21, 2020

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

@bors r-
that PR is moving ahead now

@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 Apr 22, 2020
@spastorino
Copy link
Member

@RalfJung according to https://rust-lang-nursery.github.io/rust-toolstate/ miri is failing and the release is coming tomorrow. Unsure if this PR will fix miri, I guess it will, but I'm not sure why did you r- and if there's something I'd need to do for this to move forward.

@Mark-Simulacrum
Copy link
Member

miri is not gated for releases, so that's not a problem (we've already prepared artifacts as of Monday, and cut beta yesterday).

This is not a blocker for the release.

@RalfJung
Copy link
Member Author

Yeah, Miri is nightly-only. So releases really don't matter, we shouldn't even try to build it on beta/stable.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Apr 22, 2020

📌 Commit 9b11c60 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2020
@bors
Copy link
Contributor

bors commented Apr 23, 2020

⌛ Testing commit 9b11c60 with merge 66f7a5d...

@bors
Copy link
Contributor

bors commented Apr 23, 2020

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing 66f7a5d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 23, 2020
@bors bors merged commit 66f7a5d into rust-lang:master Apr 23, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #71343!

Tested on commit 66f7a5d.
Direct link to PR: #71343

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 23, 2020
Tested on commit rust-lang/rust@66f7a5d.
Direct link to PR: <rust-lang/rust#71343>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@RalfJung RalfJung deleted the miri branch April 23, 2020 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#70629
6 participants