Skip to content

Revert "[Incremental] Dependency fixes in preparation for fine-grained dependencies" #29108

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
Merged
merged 1 commit into from
Jan 10, 2020
Merged

Revert "[Incremental] Dependency fixes in preparation for fine-grained dependencies" #29108

merged 1 commit into from
Jan 10, 2020

Conversation

compnerd
Copy link
Member

Reverts #29009

This change broke the Windows bot. Reverting until the issue on the Windows bots can be addressed.

@compnerd
Copy link
Member Author

CC: @davidungar @CodaFi

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - b483047

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - b483047

@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - b483047

@compnerd
Copy link
Member Author

CC: @harlanhaskins

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - b483047

@compnerd
Copy link
Member Author

@swift-ci please test

@CodaFi
Copy link
Contributor

CodaFi commented Jan 10, 2020

Please don’t merge that second revert. That commit is ancient. There is a deeper cause to these failures.

@CodaFi
Copy link
Contributor

CodaFi commented Jan 10, 2020

Do you have any insight into the reason things aren’t working here?

@compnerd
Copy link
Member Author

No, not off hand; Actually, taking a closer look, seems that the failure that exits without the second change is actually what is happening on Windows - so that brings things to parity. I'll remove that change from the stack, but I cannot get this merged :/

@compnerd compnerd force-pushed the revert-29009-fine-grained-fixes-post-rb branch from 73e8a47 to b483047 Compare January 10, 2020 06:18
@compnerd
Copy link
Member Author 

Assertion failed: interface->getKey().isInterface() && implementation->getKey().isImplementation() && "Interface must be interface, implementation must be implementation.", file C:\agent\_work\6\s\toolchain\swift\include\swift/AST/FineGrainedDependencies.h, line 396

@compnerd
Copy link
Member Author

@CodaFi can you either force push the revert or fix it?

@CodaFi
Copy link
Contributor

CodaFi commented Jan 10, 2020

I don’t have the authority. I’ll ask our build czars.

@shahmishal shahmishal merged commit a2be4fe into master Jan 10, 2020
@shahmishal
Copy link
Member

Merged to unblock Windows CI

@shahmishal shahmishal deleted the revert-29009-fine-grained-fixes-post-rb branch January 10, 2020 06:40
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 73e8a474f1cb71d3fb6625130194c310a77e36d1

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 73e8a474f1cb71d3fb6625130194c310a77e36d1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@compnerd @swift-ci @CodaFi @shahmishal