From aa0de4323f4a8b0eb435aa9bc03690efc54b1c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Kr=C3=BCss?= <tillkruss@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:38:53 -0700
Subject: [PATCH 1/4] remove php 7.4 lock to relay 0.7.0

---
 src/scripts/extensions/relay.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/scripts/extensions/relay.sh b/src/scripts/extensions/relay.sh
index 4aed3e44..932f9a87 100644
--- a/src/scripts/extensions/relay.sh
+++ b/src/scripts/extensions/relay.sh
@@ -2,11 +2,7 @@
 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
+    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
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"

From 9cf252c3022be7dd715394228bd4a4260a682582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Kr=C3=BCss?= <tillkruss@users.noreply.github.com>
Date: Thu, 16 Oct 2025 16:44:22 -0700
Subject: [PATCH 2/4] remove more 0.7.0 logic

---
 src/scripts/extensions/relay.sh | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/scripts/extensions/relay.sh b/src/scripts/extensions/relay.sh
index 932f9a87..a64462a7 100644
--- a/src/scripts/extensions/relay.sh
+++ b/src/scripts/extensions/relay.sh
@@ -44,19 +44,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
@@ -65,12 +52,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
 }
 

From 2e18086d640621452e38bcb3c3c420ef703e165e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Kr=C3=BCss?= <tillkruss@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:05:25 -0700
Subject: [PATCH 3/4] switch to latest stable when it's available

---
 src/scripts/extensions/relay.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scripts/extensions/relay.sh b/src/scripts/extensions/relay.sh
index a64462a7..962f6a3a 100644
--- a/src/scripts/extensions/relay.sh
+++ b/src/scripts/extensions/relay.sh
@@ -2,7 +2,8 @@
 get_relay_version() {
  local ext=$1
   if [[ "$ext" =~ ^relay$ ]]; then
-    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
+  relay_release
+    get -s -n "" "${relay_release:?}" 2<&1 | xargs
   else
     relay_version="${ext##*-}"
     echo "v${relay_version/v//}"
@@ -131,7 +132,7 @@ 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

From 1e8cc75dad4e9abc97e295238b27582a53a7e6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Kr=C3=BCss?= <tillkruss@users.noreply.github.com>
Date: Thu, 16 Oct 2025 18:31:56 -0700
Subject: [PATCH 4/4] print version number

---
 src/scripts/extensions/relay.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/extensions/relay.sh b/src/scripts/extensions/relay.sh
index 962f6a3a..03588572 100644
--- a/src/scripts/extensions/relay.sh
+++ b/src/scripts/extensions/relay.sh
@@ -140,7 +140,7 @@ add_relay() {
     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"