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

[ms-quic] Remove from ci.baseline.txt and fix UWP builds. #39498

Merged
merged 3 commits into from
Jun 25, 2024

Conversation

BillyONeal
Copy link
Member

@BillyONeal BillyONeal commented Jun 24, 2024

Also fix uwp builds so that all ci.baseline.txt entries can be removed, submitted upstream as microsoft/msquic#4373
Also fix x86-windows builds which incorrectly compared SYSTEM_PROCESSOR with 'win32' rather than 'x86'. Submitted upstream as microsoft/msquic#4374 . This patch originally authored by @LilyWangLL

Originally started from #39475

Co-authored by: Lily Wang [email protected]

Also fix uwp builds so that all ci.baseline.txt entries can be removed, submitted upstream as microsoft/msquic#4373

Originally started from microsoft#39475

Co-authored by: Lily Wang <[email protected]>
@BillyONeal BillyONeal added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. category:infrastructure Pertaining to the CI/Testing infrastrucutre labels Jun 24, 2024
OPTIONS
${FEATURE_OPTIONS}
-DQUIC_SOURCE_LINK=OFF
-DQUIC_TLS=openssl
-DQUIC_TLS_SECRETS_SUPPORT=ON
Copy link
Member Author

@BillyONeal BillyONeal Jun 24, 2024

Choose a reason for hiding this comment

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

CMake Warning at installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_configure.cmake:327 (message):
  The following variables are not used in CMakeLists.txt:

      QUIC_TLS_SECRETS_SUPPORT

  Please recheck them and remove the unnecessary options from the
  `vcpkg_cmake_configure` call.

  If these options should still be passed for whatever reason, please use the
  `MAYBE_UNUSED_VARIABLES` argument.

Appears dead:

VS Code showing that QUIC_TLS_SECRETS_SUPPORT doesn't exist in the codebase

@BillyONeal
Copy link
Member Author

BillyONeal commented Jun 25, 2024

Note that upstream has comments on microsoft/msquic#4374 which broke some of their builds using the Visual Studio generators, but I think we should take this as-is because vcpkg always uses ninja and this turns on more testing. (Of course it should be changed to the actual change as accepted by upstream ASAP)

BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Jun 25, 2024
As requested by upstream maintainer @nibanks in microsoft#39332 (review)

This should probably be after microsoft#39498 makes CI test msquic for more targets.
@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Jun 25, 2024
@BillyONeal BillyONeal merged commit 2e7fd31 into microsoft:master Jun 25, 2024
17 checks passed
@BillyONeal
Copy link
Member Author

Thanks for the initial fix @LilyWangLL ! Thanks for the review @JavierMatosD ! :)

@BillyONeal BillyONeal deleted the fix-quic branch June 25, 2024 18:03
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Jun 26, 2024
[ms-quic] Remove from ci.baseline.txt and fix UWP builds. (microsoft#39498)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:infrastructure Pertaining to the CI/Testing infrastrucutre category:port-bug The issue is with a library, which is something the port should already support 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.

3 participants