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

[DiscordCoreAPI] to v2.0.8 and [Jsonifier] to v0.9.98 #42386

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −27
Open

[DiscordCoreAPI] to v2.0.8 and [Jsonifier] to v0.9.98 #42386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 2 additions & 15 deletions ports/discordcoreapi/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO RealTimeChris/DiscordCoreAPI
REF "v${VERSION}"
SHA512 344e960491e17e9626f6ab4a42f28fe59842c0c15cf32ef2508e850099105667c651feaa6dd642207413fbeac43283310fe2b9a98a2ebfd4a49716da43e5cade
SHA512 89878716432457bea78e5fc6c29f223f78a733897993596db278fd32afd45b31b0b665f478cb80938527da9325d5afa964d52ea405d1c4be46c79ed690038790
HEAD_REF main
)

# discordcoreapi consumes extreme amounts of memory (>9GB per .cpp file). With our default
# concurrency values this causes hanging and/or OOM killing on Linux build machines and
# warnings on the Windows machines like:
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# #[warning]Free memory is lower than 5%; Currently used: 99.99%
# Cut the requested concurrency in quarter to avoid this.
if(VCPKG_CONCURRENCY GREATER 4)
math(EXPR VCPKG_CONCURRENCY "${VCPKG_CONCURRENCY} / 4")
endif()
Comment on lines -20 to -22
Copy link
Contributor

Choose a reason for hiding this comment

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

For reference, testing with 16 CPUs, peak memory exceeded 24G with 16 processes.

Please keep this part to prevent possible OOM. (Even if limited it, the CPU usage is still close to 100%)


vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# Due to CMake/DCADetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
DISABLE_PARALLEL_CONFIGURE
)

vcpkg_cmake_install()
Expand All @@ -37,4 +24,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")

3 changes: 1 addition & 2 deletions ports/discordcoreapi/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "discordcoreapi",
"version": "2.0.7",
"port-version": 1,
"version": "2.0.8",
"description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
"homepage": "https://discordcoreapi.com",
"license": "MIT",
Expand Down
6 changes: 2 additions & 4 deletions ports/jsonifier/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO realtimechris/jsonifier
REF "v${VERSION}"
SHA512 6168378a117850297fcda78853a0babd0ce7e0ca21b3e8c276acb7e75e04d85ed8909061a62e3324c309fe9e31bc59d89ea06e47853b50481843273e95172ab8
REF "v${VERSION}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
REF "v${VERSION}"
REF "v${VERSION}"

SHA512 0e08b5114a09f3e5cf41d245358baadecdd1559deba16a71dbb5a953882d9fc07587e7b27b4fbcbf810f8b2554c6afa1038b24447da51ea266b2557ff0d7a0d2
HEAD_REF main
)

set(VCPKG_BUILD_TYPE release) # header-only

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# Due to CMake/JsonifierDetectArchitecture.cmake invoking a sub-CMake and using the source tree as the target
DISABLE_PARALLEL_CONFIGURE
)

vcpkg_cmake_install()
Expand Down
3 changes: 1 addition & 2 deletions ports/jsonifier/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "jsonifier",
"version": "0.9.97",
"port-version": 1,
"version": "0.9.98",
"description": "A few classes for parsing and serializing json - very rapidly.",
"homepage": "https://github.com/realtimechris/jsonifier",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2357,8 +2357,8 @@
"port-version": 4
},
"discordcoreapi": {
"baseline": "2.0.7",
"port-version": 1
"baseline": "2.0.8",
"port-version": 0
},
"discount": {
"baseline": "3.0.0d",
Expand Down Expand Up @@ -3909,8 +3909,8 @@
"port-version": 0
},
"jsonifier": {
"baseline": "0.9.97",
"port-version": 1
"baseline": "0.9.98",
"port-version": 0
},
"jsonnet": {
"baseline": "0.20.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/discordcoreapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9f2280e860aebd74f106d91872ce53ea4d51b8bf",
"version": "2.0.8",
"port-version": 0
},
{
"git-tree": "1371e3f72145af807a144e3fadb1daf58c0b7cdd",
"version": "2.0.7",
Expand Down
5 changes: 5 additions & 0 deletions versions/j-/jsonifier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a92efb571bd140596c506b01163c36bf89b1c95a",
"version": "0.9.98",
"port-version": 0
},
{
"git-tree": "5d654c9f844e2a31fdefed0d5e628d241e6451f6",
"version": "0.9.97",
Expand Down