Skip to content

Commit

Permalink
[cppgraphqlgen] Update to latest 4.0.0 release (microsoft#22071)
Browse files Browse the repository at this point in the history
* [cppgraphqlgen] Update to latest 4.0.0 release

* [cppgraphqlgen] vcpkg x-add-version cppgraphqlgen

* [cppgraphqlgen] Replace deprecated vcpkg functions

* [cppgraphqlgen] Re-run vcpkg x-add-version

* Flag the x64-linux CI pipeline as known failure
  • Loading branch information
wravery authored Dec 20, 2021
1 parent 17cefc2 commit bc85a63
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 12 deletions.
15 changes: 6 additions & 9 deletions ports/cppgraphqlgen/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/cppgraphqlgen
REF v3.6.0
SHA512 148751b1db1b3e917e74ef93fe3533a29153f0b5d1a20544eda32d0376e2c6f5cfc2d60fbc9d077d595e7072d0b6a36dbf8f2524903db40b576ee48196b2c3e8
REF v4.0.0
SHA512 5e356234e9e47977077f36fdd4a811fe140559a6961b2c8f1a4cd56559df444e890da1863d6b020b1afcec81cd82f7bf91d907a635089459b98da9b74613aae0
HEAD_REF main
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DGRAPHQL_BUILD_TESTS=OFF
-DGRAPHQL_UPDATE_VERSION=OFF
Expand All @@ -22,16 +21,14 @@ vcpkg_configure_cmake(
-DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets()
vcpkg_cmake_config_fixup()

vcpkg_copy_tools(
TOOL_NAMES schemagen
TOOL_NAMES schemagen clientgen
SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
12 changes: 10 additions & 2 deletions ports/cppgraphqlgen/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{
"name": "cppgraphqlgen",
"version-semver": "3.6.0",
"version-semver": "4.0.0",
"description": "C++ GraphQL schema service generator",
"homepage": "https://github.com/microsoft/cppgraphqlgen",
"dependencies": [
"boost-program-options",
"pegtl",
"rapidjson"
"rapidjson",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
3 changes: 3 additions & 0 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ cpp-netlib:x64-uwp=fail
cppcoro:x64-linux=fail
cppcoro:arm-uwp=fail
cppcoro:x64-uwp=fail
# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support.
# This is known to work on x64-linux as of gcc 10.3.0.
cppgraphqlgen:x64-linux=fail
cpuinfo:arm64-windows=fail
crashpad:arm64-windows=fail
crashpad:arm-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1573,7 +1573,7 @@
"port-version": 1
},
"cppgraphqlgen": {
"baseline": "3.6.0",
"baseline": "4.0.0",
"port-version": 0
},
"cppitertools": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cppgraphqlgen.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6f5eb4a891a143e9d56a8e4791fb87da321a561c",
"version-semver": "4.0.0",
"port-version": 0
},
{
"git-tree": "0c1dadfa4133064be08120a65fd9e2ed3a339bb8",
"version-semver": "3.6.0",
Expand Down

0 comments on commit bc85a63

Please sign in to comment.