Skip to content

[protobuf] Fix protobuf build failed on CI#11459

Merged
strega-nil merged 2 commits intomicrosoft:masterfrom
LilyWangL:dev/Lily/PR11397
May 20, 2020
Merged

[protobuf] Fix protobuf build failed on CI#11459
strega-nil merged 2 commits intomicrosoft:masterfrom
LilyWangL:dev/Lily/PR11397

Conversation

@LilyWangL
Copy link
Contributor

@LilyWangL LilyWangL commented May 20, 2020

Describe the pull request

  • What does your PR fix?
    Due to the following code, protobuf arm64-windows arm-uwp x64-uwp build failed on CI pipelines, modify the ci.baseline.txt to fix this issue. Related PR [protobuf] protobuf v3.12.0 #11397
if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
    set(protobuf_BUILD_PROTOC_BINARIES OFF)
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME)
    set(protobuf_BUILD_PROTOC_BINARIES OFF)
else()
    set(protobuf_BUILD_PROTOC_BINARIES ON)
endif()

if(NOT protobuf_BUILD_PROTOC_BINARIES AND NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/protobuf)
    message(FATAL_ERROR "Cross-targetting protobuf requires the x86-windows protoc to be available. Please install protobuf:x86-windows first.")
endif()
  • Which triplets are supported/not supported? Have you updated the CI baseline?
    Yes
  • Does your PR follow the maintainer guide?
    Yes

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

I think 'ignore' much better for protobuf.

@LilyWangL LilyWangL mentioned this pull request May 20, 2020
@LilyWangL LilyWangL marked this pull request as ready for review May 20, 2020 06:29
@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label May 20, 2020
@JackBoosY
Copy link
Contributor

@strega-nil Could you please merge this PR first?

Thanks.

@strega-nil
Copy link
Contributor

Cool, LGTM! Thanks @LilyWangL :)

@strega-nil strega-nil merged commit 0569520 into microsoft:master May 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants