[Baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI#11496
Merged
strega-nil merged 5 commits intomicrosoft:masterfrom May 23, 2020
Merged
[Baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI#11496strega-nil merged 5 commits intomicrosoft:masterfrom
strega-nil merged 5 commits intomicrosoft:masterfrom
Conversation
PhoebeHui
changed the title
Contributor
Author
|
@strega-nil, could you help merge this PR? |
JackBoosY
approved these changes
May 22, 2020
JackBoosY
added
the
info:needs-maintainer-attention
Member
|
Sorry, I broke this with #11511 |
Contributor
|
Thanks @PhoebeHui :) Hopefully @BillyONeal can refix this next week :3 |
Member
|
@strega-nil #11545 should fix :) |
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
4 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.
Related to #11427
Fix the The following issues in CI baseline
Building boost-* with arm-uwp requires the x86-windows boost-* which breaks CI testing, Ignore them
boost-atomic:arm-uwp=ignore
boost-signals:arm-uwp=ignore
boost-exception:arm-uwp=ignore
boost-regex:arm-uwp=ignore
boost-nowide:arm-uwp=ignore
boost-system:arm-uwp=ignore
boost-container:arm-uwp=ignore
Resolve conflicts bettwen microsoft-signalr and signalrclient, they are different repo, and they don't depend on each other.
Failures:
Installing package microsoft-signalr[core,cpprestsdk,default-features]:x86-windows...
The following files are already installed in F:/vcpkg/boost_173/vcpkg/installed/x86-windows and are in conflict with microsoft-signalr:x86-windows
Installed by signalrclient:x86-windows
bin/signalrclient.dll
debug/bin/signalrclient.dll
debug/lib/signalrclient.lib
include/signalrclient/_exports.h
include/signalrclient/connection.h
include/signalrclient/connection_state.h
include/signalrclient/hub_connection.h
include/signalrclient/hub_exception.h
include/signalrclient/log_writer.h
include/signalrclient/trace_level.h
include/signalrclient/transport_type.h
include/signalrclient/web_exception.h
lib/signalrclient.lib
PASSING, REMOVE FROM FAIL LIST: itk:x64-osx (/Users/vagrant/Data/work/1/s/scripts/ci.baseline.txt)