Skip to content

Ignore xcuserdata/ #2184

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
Jun 25, 2019
Merged

Ignore xcuserdata/ #2184

merged 1 commit into from
Jun 25, 2019

Conversation

dduan
Copy link
Contributor

@dduan dduan commented Jun 22, 2019

Now that SwiftPM is more likely to checked in alongside with Xcode
artifacts, ignore the commonly ignored Xcode artifacts.

@dduan dduan requested review from aciidgh and neonichu June 22, 2019 22:01
@dduan
Copy link
Contributor Author

dduan commented Jun 23, 2019

@swift-ci smoke test

@aciidgh
Copy link
Contributor

aciidgh commented Jun 23, 2019

This is a bit complex :(

I don't think we should ignore the entire directory by default since users might want to check in things like the mirror config file. Similarly, Xcode's xcshareddata directory is also probably worth checking in but there is nothing interesting right now (except maybe custom/modified schemes). However, it definitely makes sense to ignore the xcuserdata directory. I am curious what @neonichu thinks about this.

@dduan
Copy link
Contributor Author

dduan commented Jun 23, 2019

Yeah I suspected so. I'll update it to xcuserdata/

Now that SwiftPM is more likely to checked in alongside with Xcode
artifacts, ignore the commonly ignored Xcode artifacts.
@dduan dduan force-pushed the ignore-dot-swiftpm branch from 2bc43f1 to d444c08 Compare June 23, 2019 01:49
@dduan dduan changed the title Ignore .swiftpm for git by default Ignore xcuserdata/ Jun 23, 2019
@dduan
Copy link
Contributor Author

dduan commented Jun 23, 2019

@swift-ci smoke test

@aciidgh
Copy link
Contributor

aciidgh commented Jun 24, 2019

@swift-ci smoke test linux

@aciidgh aciidgh merged commit 3eaf718 into swiftlang:master Jun 25, 2019
@aciidgh
Copy link
Contributor

aciidgh commented Jun 25, 2019

@dduan do you want to cherry-pick this to 5.1 branch?

@dduan dduan deleted the ignore-dot-swiftpm branch June 25, 2019 02:22
@dduan dduan mentioned this pull request Jun 25, 2019
@dduan
Copy link
Contributor Author

dduan commented Jun 25, 2019

@aciidb0mb3r ok #2189

@keith
Copy link
Member

keith commented Jul 9, 2019

I just filed FB6569495 about this too, shared schemes get through this gitignore still, I'm not sure what the desired behavior is there

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.

4 participants