Skip to content

update miri - #61295

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri
Jun 3, 2019
Merged

update miri#61295
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri

Conversation

@RalfJung

@RalfJungRalfJung commented May 28, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@rust-highfive

rust-highfive commented May 28, 2019

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2019
@RalfJung

RalfJung commented May 29, 2019

Copy link
Copy Markdown
MemberAuthor

Dang, Miri is broken again.

@RalfJung

RalfJung commented May 29, 2019

Copy link
Copy Markdown
MemberAuthor

All right, this should do it.

@oli-obk

oli-obk commented May 29, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup cc @Centril

@bors

bors commented May 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 34d5239 has been approved by oli-obk

@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 May 29, 2019
@Centril

Centril commented May 29, 2019

Copy link
Copy Markdown
Contributor

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 ofrust-lang#61295- RalfJung:miri, r=oli-obk
023fa2a
update miri
r? @oli-obkFixesrust-lang#60533
@CentrilCentril mentioned this pull request May 30, 2019
Closed
@RalfJung

RalfJung commented May 30, 2019

Copy link
Copy Markdown
MemberAuthor

And it broke again.

@bors r-

@borsbors 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

Centril commented May 30, 2019

Copy link
Copy Markdown
Contributor

@bors rollup-

@RalfJung

RalfJung commented May 30, 2019

Copy link
Copy Markdown
MemberAuthor

And fixed again.

@bors r=oli-obk p=1

@bors

bors commented May 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1cb019222143d47d2377d703efcc2c60cdd91f05 has been approved by oli-obk

@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-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
@borsbors 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

RalfJung commented May 31, 2019

Copy link
Copy Markdown
MemberAuthor

Rebased.

@bors r=oli-obk

@bors

bors commented May 31, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3ea53ddba8089cdb6ef05c93868cd0ac8fd9c707 has been approved by oli-obk

@borsbors 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
@borsbors 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

RalfJung commented May 31, 2019

Copy link
Copy Markdown
MemberAuthor

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

@bors r-

@borsbors 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

RalfJung commented Jun 2, 2019

Copy link
Copy Markdown
MemberAuthor

Finally...

@bors r=oli-obk

@bors

bors commented Jun 2, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 4dfed4a has been approved by oli-obk

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

bors commented Jun 2, 2019

Copy link
Copy Markdown
Collaborator

⌛ 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-obkFixes#60533
@bors

bors commented Jun 3, 2019

Copy link
Copy Markdown
Collaborator

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

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

rust-highfive commented Jun 3, 2019

Copy link
Copy Markdown
Contributor

📣 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 byrust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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