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

Remove multiple-definitions test #87087

Merged
merged 1 commit into from
Jul 12, 2021
Merged

Conversation

fee1-dead
Copy link
Member

r? @joshtriplett

Temporary solution to #87084.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 12, 2021
@joshtriplett
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 12, 2021

📌 Commit 4adcd60 has been approved by joshtriplett

@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 Jul 12, 2021
@bors
Copy link
Contributor

bors commented Jul 12, 2021

⌛ Testing commit 4adcd60 with merge b5a2cce...

@ricobbe
Copy link
Contributor

ricobbe commented Jul 12, 2021

I should have a fix for the original test in a couple of hours. Do we want to hold off on this, or what?

@petrochenkov
Copy link
Contributor

For the future, adding // ignore-test with a FIXME would be more appropriate than outright removing the test.
(I'm not r-'ing this since the test is already going through pre-merge CI.)

@bors
Copy link
Contributor

bors commented Jul 12, 2021

☀️ Test successful - checks-actions
Approved by: joshtriplett
Pushing b5a2cce to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 12, 2021
@bors bors merged commit b5a2cce into rust-lang:master Jul 12, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 12, 2021
@joshtriplett
Copy link
Member

@ricobbe We can always re-add this the moment you have a fix.

@petrochenkov Good to know, thank you; I'll try to remember that for the future.

@ricobbe
Copy link
Contributor

ricobbe commented Jul 12, 2021

I should have a PR posted with a fix for this within the hour; that PR will re-add the test. EDIT: #87092.

@fee1-dead fee1-dead deleted the fix-try-2 branch July 13, 2021 01:32
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.

7 participants