Skip to content

[redis-plus-plus]Update version to 1.3.8 #31851

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

Merged
dan-shaw merged 4 commits into from
Jun 7, 2023
Merged

[redis-plus-plus]Update version to 1.3.8 #31851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6eec9a
[redis-plus-plus]Update version to 1.3.8
Jun 6, 2023
0d41dcc
version
Jun 6, 2023
4402e5d
fix file absolute path
Jun 7, 2023
a306288
version
Jun 7, 2023
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
13 changes: 13 additions & 0 deletions ports/redis-plus-plus/fix-absolute-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a075aca..8657ef7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB})

CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval)

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h")
Copy link
Member

@BillyONeal BillyONeal Jun 8, 2023

Choose a reason for hiding this comment

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

This writes to the source directory so it needs DISABLE_PARALLEL_CONFIGURE. Will fix in #31723


# Restore CMAKE_REQUIRED_LIBRARIES
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK})
5 changes: 3 additions & 2 deletions ports/redis-plus-plus/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sewenew/redis-plus-plus
REF f3b19a8a1f609d1a1b79002802e5cf8c336dc262 # 1.3.7
SHA512 c99a4506be06224ebc4adaa29d5eeff0f6efae8b99e48ac02c26cec4a86fb46237a7d380ddb89eddc3d2e75c0c567e9b68610bcf271a0c708bca8ca6a5641075
REF 4368319fb668204f345da05b9dd79762506c67b6 # 1.3.8
SHA512 37774078fb98992c4b4be276c91a2b6a8b8810d62a5087184d1fa2c05db77de15058d5139747578f7a2f9219351c05de32740b63c153ea902493d4b5d05c2d68
HEAD_REF master
PATCHES
fix-conversion.patch
fix-dependency-libuv.patch
fix-absolute-path.patch
)

if("cxx17" IN_LIST FEATURES)
Expand Down
2 changes: 1 addition & 1 deletion ports/redis-plus-plus/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "redis-plus-plus",
"version-semver": "1.3.7",
"version-semver": "1.3.8",
"description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11",
"homepage": "https://github.com/sewenew/redis-plus-plus",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7061,7 +7061,7 @@
"port-version": 0
},
"redis-plus-plus": {
"baseline": "1.3.7",
"baseline": "1.3.8",
"port-version": 0
},
"refl-cpp": {
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/redis-plus-plus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534",
"version-semver": "1.3.8",
"port-version": 0
},
{
"git-tree": "6a48ccb1b618d7dedeeb50bde2ecc413b63c3742",
"version-semver": "1.3.7",
Expand Down