Skip to content

update the miri submodule #51325

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

Merged
merged 2 commits into from
Jun 3, 2018
Merged

update the miri submodule #51325

merged 2 commits into from
Jun 3, 2018

Conversation

japaric
Copy link
Member

@japaric japaric commented Jun 3, 2018

the submodule currently seems to be pointing to a miri branch that has been deleted.

r? @TimNN

@rust-highfive
Copy link
Contributor

warning Warning 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 Jun 3, 2018
@TimNN
Copy link
Contributor

TimNN commented Jun 3, 2018

@bors r+ p=20

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

‼️ Invalid head SHA found, retrying: 0000000000000000000000000000000000000000

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

📌 Commit c36bb94 has been approved by TimNN

@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 Jun 3, 2018
@TimNN
Copy link
Contributor

TimNN commented Jun 3, 2018

For context:

The travis build of #50338 (comment) failed due to a bad miri submodule commit. This PR updates to miri master, hopefully fixing the problem before it can cause problems on bors.

It looks like the issue here was that the miri commit referenced belonged to a miri-PR-branch (rust-lang/miri#379). That branch got merged & deleted recently, so GitHub would no longer allow download of the referenced commit.

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

⌛ Testing commit c36bb94 with merge 7d576f2...

bors added a commit that referenced this pull request Jun 3, 2018
update the miri submodule

the submodule currently seems to be pointing to a miri branch that has been deleted.

r? @TimNN
@oli-obk
Copy link
Contributor

oli-obk commented Jun 3, 2018

Sorry about that. I pressed the wrong merge button on the miri repo

This has since been fixed.

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: TimNN
Pushing 7d576f2 to master...

@bors bors merged commit c36bb94 into rust-lang:master Jun 3, 2018
@japaric japaric deleted the miri-up branch June 3, 2018 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants