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.

Sign up for GitHub

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

Jump to bottom

[vcpkg baseline][rest-rpc] Skip check in baseline #13295

Merged
merged 2 commits into from
Sep 2, 2020
Merged

[vcpkg baseline][rest-rpc] Skip check in baseline #13295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62f4123
[rest-rpc] Skip check in baseline
Sep 2, 2020
a7e280d
[rest-rpc][msgpack] Add error message
Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/msgpack/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: msgpack
Version: 3.2.0-1
Version: 3.2.0
Port-Version: 2
Homepage: https://github.com/msgpack/msgpack-c
Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.
5 changes: 4 additions & 1 deletion ports/msgpack/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
include(vcpkg_common_functions)
if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h)
message(FATAL_ERROR "Cannot install ${PORT} when rest-rpc is already installed, please remove rest-rpc using \"./vcpkg remove rest-rpc:${TARGET_TRIPLET}\"")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO msgpack/msgpack-c
Expand Down
1 change: 1 addition & 0 deletions ports/rest-rpc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: rest-rpc
Version: 0.07
Port-Version: 1
Homepage: https://github.com/qicosmos/rest_rpc
Description: c++11, high performance, cross platform, easy to use rpc framework
Build-Depends: asio
5 changes: 4 additions & 1 deletion ports/rest-rpc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# header-only library
if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h)
message(FATAL_ERROR "Cannot install ${PORT} when msgpack is already installed, please remove msgpack using \"./vcpkg remove msgpack:${TARGET_TRIPLET}\"")
endif()

# header-only library
set(RESTRPC_VERSION V0.07)
set(RESTRPC_HASH 148152776c8c4f16e404c62ab3f46618e1817c0b4b186dbcc399c859efd110ed5a207bf56e961c312f80844f696f597068e0abc00e426409d50a2889d30c6d8e)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rest-rpc-${RESTRPC_VERSION})
Expand Down
9 changes: 9 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,15 @@ reproc:arm-uwp=fail
reproc:x64-uwp=fail
restbed:arm-uwp=fail
restbed:x64-uwp=fail
# file conflicts with msgpack
rest-rpc:x86-windows=skip
rest-rpc:x64-windows=skip
rest-rpc:x64-windows-static=skip
rest-rpc:x64-uwp=skip
rest-rpc:arm-uwp=skip
rest-rpc:arm64-windows=skip
rest-rpc:x64-linux=skip
rest-rpc:x64-osx=skip
rhash:arm64-windows=fail
rhash:arm-uwp=fail
rhash:x64-uwp=fail
Expand Down