From 8d8f975af3ade414c49ae86db33d455ef1dbca03 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Mon, 9 Jun 2025 20:03:18 +0530 Subject: [PATCH] Pin hiredis version to 1.1 for relay [skip ci] --- src/scripts/extensions/relay.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/scripts/extensions/relay.sh b/src/scripts/extensions/relay.sh index 4e8fd8e7..626da6eb 100644 --- a/src/scripts/extensions/relay.sh +++ b/src/scripts/extensions/relay.sh @@ -48,12 +48,17 @@ change_library_paths() { fi } -# Link hiredis library -link_hiredis() { - lib_dir="${brew_prefix:?}"/opt/hiredis/lib - if [ -e "$lib_dir"/libhiredis_ssl.1.1.0.dylib ]; then - sudo ln -sf "$lib_dir"/libhiredis_ssl.1.1.0.dylib "$lib_dir"/libhiredis_ssl.dylib.1.1.0 - fi +# Add hiredis library +add_hiredis() { + hiredis_url=https://github.com/redis/hiredis/archive/v1.1.0.tar.gz + hiredis_sha=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 + sed -Ei.bak -e "s#^ url.*# url \"$hiredis_url\"#" -e "s#^ sha256.*# sha256 \"$hiredis_sha\"#" ${core_repo:?}/Formula/h/hiredis.rb + brew install -s hiredis + lib_dir="${brew_prefix:?}"/opt/hiredis/lib + if [ -e "$lib_dir"/libhiredis_ssl.1.1.0.dylib ]; then + sudo ln -sf "$lib_dir"/libhiredis_ssl.1.1.0.dylib "$lib_dir"/libhiredis_ssl.dylib.1.1.0 + fi + mv ${core_repo:?}/Formula/h/hiredis.rb.bak ${core_repo:?}/Formula/h/hiredis.rb } # Add relay dependencies @@ -64,8 +69,8 @@ add_relay_dependencies() { if [ "$os" = "Darwin" ]; then . "${0%/*}"/tools/brew.sh configure_brew - brew install hiredis lz4 zstd concurrencykit - link_hiredis + brew install lz4 zstd concurrencykit + add_hiredis fi }