Merge pull request #1011 from tillkruss/patch-2

Remove PHP 7.4 lock to Relay `0.7.0`

Author: shivammathur

src/scripts/extensions/relay.sh

@@ -2,11 +2,8 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    if [ "${version:?}" = "7.4" ]; then
-      echo 'v0.7.0'
-    else
-      get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
-    fi
+  relay_release
+    get -s -n "" "${relay_release:?}" 2<&1 | xargs
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -48,19 +45,6 @@ change_library_paths() {
   fi
 }
 
-# Add hiredis library
-add_hiredis_1.1.0() {
-  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
 add_relay_dependencies() {
   add_extension json
@@ -69,12 +53,7 @@ add_relay_dependencies() {
   if [ "$os" = "Darwin" ]; then
     . "${0%/*}"/tools/brew.sh
     configure_brew
-    if [ "$relay_version" = "v0.7.0" ]; then
-      brew install lz4 zstd concurrencykit
-      add_hiredis_1.1.0 >/dev/null 2>&1
-    else
-      brew install lz4 hiredis zstd concurrencykit
-    fi
+    brew install lz4 hiredis zstd concurrencykit
   fi
 }
 
@@ -153,15 +132,15 @@ add_relay() {
   local arch
   local url
   os=$(uname -s)
-  relay_releases=https://github.com/cachewerk/relay/releases
+  relay_release=https://builds.r2.relay.so/meta/latest
   relay_trunk=https://builds.r2.relay.so
   relay_version=$(get_relay_version "$ext")
   add_relay_dependencies >/dev/null 2>&1
   if shared_extension relay; then
     message="Enabled"
   else
     add_relay_helper >/dev/null 2>&1
-    message="Installed and enabled"
+    message="Installed and enabled ${relay_version}"
   fi
   configure_relay >/dev/null 2>&1
   add_extension_log relay "$message"