Skip to content

Remove non-inclusive language #134

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 1 commit into from
Oct 8, 2020

Conversation

neonichu
Copy link
Contributor

rdar://problem/69396992

@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu
Copy link
Contributor Author

We need a corresponding PR on SwiftPM before merging.

@neonichu neonichu force-pushed the remove-non-inclusive-language branch 2 times, most recently from 30d020d to 836c96e Compare September 23, 2020 21:27
@neonichu
Copy link
Contributor Author

@swift-ci please test

rdar://problem/69396992
@neonichu neonichu force-pushed the remove-non-inclusive-language branch from 836c96e to 28ad1ed Compare October 5, 2020 20:09
@neonichu
Copy link
Contributor Author

neonichu commented Oct 5, 2020

@swift-ci please test

@neonichu neonichu merged commit 1256771 into swiftlang:main Oct 8, 2020
@neonichu neonichu deleted the remove-non-inclusive-language branch October 8, 2020 16:29
@compnerd
Copy link
Member

compnerd commented Oct 8, 2020

@neonichu this is breaking the Windows builds of swift-package-manager since swiftlang/swift-package-manager#2954 isn't merged :-(

@neonichu
Copy link
Contributor Author

neonichu commented Oct 8, 2020

Sorry, I had to wait for the final smoke test run to complete. Unfortunately we don't have a good way to merge two PRs together because of how the self-hosted job works. Hopefully we can resolve this type of issue as part of getting rid of the vendored TSC.

@neonichu
Copy link
Contributor Author

neonichu commented Oct 8, 2020

Actually, it seems like the real issue is that the self-hosted jobs have been set to "Required". The original intent was apparently to have them for faster CI iteration, but only smoke tests should be required for merging.

@neonichu
Copy link
Contributor Author

neonichu commented Oct 8, 2020

OK, this is fixed now. Only the "smoke tests" jobs are required, so in the future we can merge TSC and SwiftPM PRs together.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants