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

update miri #61295

Merged
merged 1 commit into from
Jun 3, 2019
Merged

update miri #61295

merged 1 commit into from
Jun 3, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented May 28, 2019 •
edited
Loading

r? @oli-obk

Fixes #60533

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

Dang, Miri is broken again.

@RalfJung
Copy link
Member Author

All right, this should do it.

@oli-obk
Copy link
Contributor

oli-obk commented May 29, 2019

@bors r+ rollup cc @Centril

@bors
Copy link
Contributor

bors commented May 29, 2019

📌 Commit 34d5239 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 May 29, 2019
@Centril
Copy link
Contributor

Centril commented May 29, 2019

Prioritizing #60885 over this one because only one PR can do lockfile changes; will put this PR in the next rollup.

Centril added a commit to Centril/rust that referenced this pull request May 30, 2019
@Centril
Rollup merge of rust-lang#61295 - RalfJung:miri, r=oli-obk
023fa2a 
update miri

r? @oli-obk

Fixes rust-lang#60533
@Centril Centril mentioned this pull request May 30, 2019
Closed
@RalfJung
Copy link
Member Author

And it broke again.

@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 May 30, 2019
@Centril
Copy link
Contributor

Centril commented May 30, 2019

@bors rollup-

@RalfJung
Copy link
Member Author

And fixed again.

@bors r=oli-obk p=1

@bors
Copy link
Contributor

bors commented May 30, 2019

📌 Commit 1cb019222143d47d2377d703efcc2c60cdd91f05 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2019
@bors

This comment has been minimized.

Sign in to view
@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 May 31, 2019
@RalfJung
Copy link
Member Author

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented May 31, 2019

📌 Commit 3ea53ddba8089cdb6ef05c93868cd0ac8fd9c707 has been approved by oli-obk

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 31, 2019
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 31, 2019
@RalfJung
Copy link
Member Author

Actually, #61278 will break Miri again. So let's let that land first.

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

RalfJung commented Jun 2, 2019

Finally...

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jun 2, 2019

📌 Commit 4dfed4a 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 2, 2019
@bors
Copy link
Contributor

bors commented Jun 2, 2019

⌛ Testing commit 4dfed4a with merge 607aadc...

bors added a commit that referenced this pull request Jun 2, 2019
@bors
Auto merge of #61295 - RalfJung:miri, r=oli-obk
607aadc 
update miri

r? @oli-obk

Fixes #60533
@bors
Copy link
Contributor

bors commented Jun 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 607aadc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 3, 2019
@bors bors merged commit 4dfed4a into rust-lang:master Jun 3, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61295!

Tested on commit 607aadc.
Direct link to PR: #61295

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 3, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#61295!
b4b6d1f 
Tested on commit rust-lang/rust@607aadc.
Direct link to PR: <rust-lang/rust#61295>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@RalfJung RalfJung deleted the miri branch June 10, 2019 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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#60462
5 participants
@RalfJung @rust-highfive @oli-obk @bors @Centril