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

Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. #12624

Merged
merged 5 commits into from
Aug 1, 2020

Conversation

BillyONeal
Copy link
Member

No description provided.

@BillyONeal BillyONeal added category:documentation To resolve the issue, documentation will need to be updated info:internal This PR or Issue was filed by the vcpkg team. labels Jul 29, 2020
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Jul 31, 2020
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the only thing I'd like to see.

.gitignore Outdated
!triplets/x64-osx.cmake
!/triplets/arm-uwp.cmake
!/triplets/arm64-windows.cmake
!/triplets/community
Copy link
Contributor

@strega-nil strega-nil Jul 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be after the other "official" triplets, imo, and also we shouldn't need to explicitly unignore all the files underneath /triplets/community.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be after the other "official" triplets, imo,

I really really like being able to highlight the whole block and press F9. If you want this moved I think you should suggest a rule we can apply consistently rather than cite an individual example. I don't think reordering this anywhere will make it clearer.

also we shouldn't need to explicitly unignore all the files underneath /triplets/community

OK but if we add everything in there why are we .gitignoring anything? I really don't understand why the triplets were .gitignore'd in the first place, I don't think they should be.

Copy link
Contributor

@strega-nil strega-nil Jul 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It allows a user to define their own triplets.

I'm saying you don't need to explicitly unignore all files underneath /triplets/community because you've unignored /triplets/community -- thus, they're already unignored.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It allows a user to define their own triplets.

I don't see how the .gitignore has any bearing on the ability to do this.

I'm saying you don't need to explicitly unignore all files underneath /triplets/community because you've unignored /triplets/community -- thus, they're already unignored.

Hmmmmmmmm that's not what I remember observing but I can check again.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or, you could unignore /triplets/community/*; a user should be placing their triplets under /triplets, imo

.gitignore Outdated Show resolved Hide resolved
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
@strega-nil
Copy link
Contributor

Given that this only modifies .gitignore and docs, I'll merge without finishing PR tests (although I'd like to wait for the first round)

@strega-nil strega-nil merged commit 322b17f into microsoft:master Aug 1, 2020
@BillyONeal BillyONeal deleted the gitignore branch September 4, 2020 00:19
hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
…y vcpkg_check_linkage.md doc bug. (microsoft#12624)

* Un-.gitignore /triplets/community and use an absolute glob for all non .gitignore'd triplets.

* Fix vcpkg_check_linkage.md example to a port that actually uses vcpkg_check_linkage.

* Exclude all of the community directory.

* Update .gitignore

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:documentation To resolve the issue, documentation will need to be updated info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants