Revert baseline changes from #20449#21840
Merged
BillyONeal merged 1 commit intomicrosoft:masterfrom Dec 7, 2021
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
Author
|
Alternative: merge lodepng-c into lodepng, #21846. |
JackBoosY
added
the
category:port-bug
JackBoosY
approved these changes
Dec 6, 2021
JackBoosY
added
the
info:needs-maintainer-attention
Contributor
|
I think I can accept this. |
Contributor
Author
Member
|
Thanks for the notice about the file conflicts! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does your PR fix?
Fixes CI file conflict between lodepng and lodepng-c, introduced by [osgearth] Fix osgearth vcpkg build failures and linking/compilation failures from installed bits #20449, discovered in
https://dev.azure.com/vcpkg/public/_build/results?buildId=64084&view=logs&j=c2a18d2e-37ac-57b0-b2a5-926ff10fbe32&t=b0e2c199-eacf-5d50-0d96-a04f9ea0e46a.
[osgearth] Fix osgearth vcpkg build failures and linking/compilation failures from installed bits #20449 didn't modify neither lodepng[-c] nor pdcurses. The lodepng ports show their conflict in the portfiles.
I don't know the reason for the pdcurses fail, but it does say
ONLY_DYNAMIC_CRTWhich triplets are supported/not supported? Have you updated the CI baseline?
--, yes
Does your PR follow the maintainer guide?
yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?--
CC @BillyONeal