actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2025-10-20 18:25:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1011 from tillkruss/patch-2

Browse Source 
Remove PHP 7.4 lock to Relay `0.7.0`
This commit is contained in:
Shivam Mathur
2025-10-17 07:44:57 +05:30
committed by GitHub
parent 00242b5fc2 1e8cc75dad
commit 3efd894d72
1 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/scripts/extensions/relay.sh
View File

@ -2,11 +2,8 @@
get_relay_version() { get_relay_version() {
local ext=$1 local ext=$1
if [[ "$ext" =~ ^relay$ ]]; then if [[ "$ext" =~ ^relay$ ]]; then
if [ "${version:?}" = "7.4" ]; then relay_release
echo 'v0.7.0' get -s -n "" "${relay_release:?}" 2<&1 | xargs
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
else else
relay_version="${ext##*-}" relay_version="${ext##*-}"
echo "v${relay_version/v//}" echo "v${relay_version/v//}"
@ -48,19 +45,6 @@ change_library_paths() {
fi 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_relay_dependencies() { add_relay_dependencies() {
add_extension json add_extension json
@ -69,12 +53,7 @@ add_relay_dependencies() {
if [ "$os" = "Darwin" ]; then if [ "$os" = "Darwin" ]; then
. "${0%/*}"/tools/brew.sh . "${0%/*}"/tools/brew.sh
configure_brew configure_brew
if [ "$relay_version" = "v0.7.0" ]; then brew install lz4 hiredis zstd concurrencykit
brew install lz4 zstd concurrencykit
add_hiredis_1.1.0 >/dev/null 2>&1
else
brew install lz4 hiredis zstd concurrencykit
fi
fi fi
} }
@ -153,7 +132,7 @@ add_relay() {
local arch local arch
local url local url
os=$(uname -s) 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_trunk=https://builds.r2.relay.so
relay_version=$(get_relay_version "$ext") relay_version=$(get_relay_version "$ext")
add_relay_dependencies >/dev/null 2>&1 add_relay_dependencies >/dev/null 2>&1
@ -161,7 +140,7 @@ add_relay() {
message="Enabled" message="Enabled"
else else
add_relay_helper >/dev/null 2>&1 add_relay_helper >/dev/null 2>&1
message="Installed and enabled" message="Installed and enabled ${relay_version}"
fi fi
configure_relay >/dev/null 2>&1 configure_relay >/dev/null 2>&1
add_extension_log relay "$message" add_extension_log relay "$message"