Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d33ccd80be | ||
|
|
46aa274405 | ||
|
|
9e9ad0fe5f | ||
|
|
f23390933a | ||
|
|
c64a1a91b0 | ||
|
|
7e3a83aacd | ||
|
|
c157badb12 | ||
|
|
b47f0a89fb |
2
.github/workflows/git-release.yml
vendored
2
.github/workflows/git-release.yml
vendored
@@ -38,6 +38,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: lists
|
name: lists
|
||||||
path: src/lists
|
path: src/lists
|
||||||
|
- name: Add brew to PATH
|
||||||
|
run: echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH
|
||||||
- name: Update darwin extensions list
|
- name: Update darwin extensions list
|
||||||
run: |
|
run: |
|
||||||
brew tap shivammathur/extensions
|
brew tap shivammathur/extensions
|
||||||
|
|||||||
20
package.json
20
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cache-extensions",
|
"name": "cache-extensions",
|
||||||
"version": "1.8.1",
|
"version": "1.8.2",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "Cache PHP extensions in GitHub Actions",
|
"description": "Cache PHP extensions in GitHub Actions",
|
||||||
"main": "lib/cache.js",
|
"main": "lib/cache.js",
|
||||||
@@ -41,21 +41,21 @@
|
|||||||
"setup-php": "2.21.2"
|
"setup-php": "2.21.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^28.1.7",
|
"@types/jest": "^29.0.0",
|
||||||
"@types/node": "^18.7.6",
|
"@types/node": "^18.7.14",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.33.1",
|
"@typescript-eslint/eslint-plugin": "^5.36.0",
|
||||||
"@typescript-eslint/parser": "^5.33.1",
|
"@typescript-eslint/parser": "^5.36.0",
|
||||||
"@vercel/ncc": "^0.34.0",
|
"@vercel/ncc": "^0.34.0",
|
||||||
"eslint": "^8.22.0",
|
"eslint": "^8.23.0",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
"eslint-config-prettier": "^8.5.0",
|
||||||
"eslint-plugin-import": "^2.26.0",
|
"eslint-plugin-import": "^2.26.0",
|
||||||
"eslint-plugin-jest": "^26.8.3",
|
"eslint-plugin-jest": "^27.0.1",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"jest": "^28.1.3",
|
"jest": "^29.0.1",
|
||||||
"jest-circus": "^28.1.3",
|
"jest-circus": "^29.0.1",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.7.1",
|
||||||
"ts-jest": "^28.0.8",
|
"ts-jest": "^28.0.8",
|
||||||
"typescript": "^4.7.4"
|
"typescript": "^4.8.2"
|
||||||
},
|
},
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/shivammathur/cache-extensions/issues"
|
"url": "https://github.com/shivammathur/cache-extensions/issues"
|
||||||
|
|||||||
@@ -19,5 +19,8 @@ redis
|
|||||||
ssh2
|
ssh2
|
||||||
swoole
|
swoole
|
||||||
vips
|
vips
|
||||||
|
xdebug
|
||||||
|
xdebug2
|
||||||
|
xlswriter
|
||||||
yaml
|
yaml
|
||||||
zmq
|
zmq
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ extension_dir_linux() {
|
|||||||
|
|
||||||
data() {
|
data() {
|
||||||
old_versions="5.[3-5]"
|
old_versions="5.[3-5]"
|
||||||
date='20211217'
|
date='20220831'
|
||||||
if [ "$os" = "Linux" ]; then
|
if [ "$os" = "Linux" ]; then
|
||||||
. /etc/lsb-release
|
. /etc/lsb-release
|
||||||
os=$os-$DISTRIB_CODENAME
|
os=$os-$DISTRIB_CODENAME
|
||||||
@@ -86,8 +86,6 @@ data() {
|
|||||||
dir=$(extension_dir_linux "$api_version")
|
dir=$(extension_dir_linux "$api_version")
|
||||||
sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
|
sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
|
||||||
elif [ "$os" = "Darwin" ]; then
|
elif [ "$os" = "Darwin" ]; then
|
||||||
[[ "$extensions" == *"vips"* ]] && date='20220224'
|
|
||||||
[[ "$extensions" =~ .*((pecl_)?http|mongodb).* ]] && date='20220304'
|
|
||||||
api_version=$(get_api_version)
|
api_version=$(get_api_version)
|
||||||
dir=$(extension_dir_darwin "$api_version")
|
dir=$(extension_dir_darwin "$api_version")
|
||||||
sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
|
sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
|
||||||
|
|||||||
@@ -29,10 +29,12 @@ get_dependencies() {
|
|||||||
formula_file="$tap_dir/$ext_tap/Formula/$extension@${version:?}.rb"
|
formula_file="$tap_dir/$ext_tap/Formula/$extension@${version:?}.rb"
|
||||||
if [ -e "$formula_file" ]; then
|
if [ -e "$formula_file" ]; then
|
||||||
formula_deps="$(grep "depends_on" "$formula_file" | cut -d '"' -f 2 | tr '\n' ' ')"
|
formula_deps="$(grep "depends_on" "$formula_file" | cut -d '"' -f 2 | tr '\n' ' ')"
|
||||||
|
formula_deps_from_macos="$(grep "uses_from_macos \"lib" "$formula_file" | cut -d '"' -f 2 | tr '\n' ' ')"
|
||||||
fi
|
fi
|
||||||
deps=()
|
deps=()
|
||||||
[[ -n "${list_deps[*]}" ]] && deps+=("${list_deps[@]}")
|
[[ -n "${list_deps[*]}" ]] && deps+=("${list_deps[@]}")
|
||||||
[[ -n "${formula_deps[*]}" ]] && deps+=("${formula_deps[@]}")
|
[[ -n "${formula_deps[*]}" ]] && deps+=("${formula_deps[@]}")
|
||||||
|
[[ -n "${formula_deps_from_macos[*]}" ]] && deps+=("${formula_deps_from_macos[@]}")
|
||||||
echo "${deps[@]}"
|
echo "${deps[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +119,9 @@ restore_library_helper() {
|
|||||||
if ! [ -d "$brew_prefix/opt/$dep_name" ]; then
|
if ! [ -d "$brew_prefix/opt/$dep_name" ]; then
|
||||||
brew link --force --overwrite "$dep_name" 2>/dev/null || true
|
brew link --force --overwrite "$dep_name" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
if ! [ -d "$brew_prefix/opt/$dep_name" ]; then
|
||||||
|
sudo ln -sf "$brew_cellar"/"$dep_name"/* "$brew_prefix"/opt/"$dep_name"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
restore_library() {
|
restore_library() {
|
||||||
@@ -158,8 +163,6 @@ setup_dependencies() {
|
|||||||
if [[ -n "${extensions_array[*]// /}" ]]; then
|
if [[ -n "${extensions_array[*]// /}" ]]; then
|
||||||
add_brew_tap "$php_tap"
|
add_brew_tap "$php_tap"
|
||||||
add_brew_tap "$ext_tap"
|
add_brew_tap "$ext_tap"
|
||||||
# Remove once updated on the images
|
|
||||||
curl -o "$tap_dir"/"$core_tap"/Formula/ca-certificates.rb -sL https://raw.githubusercontent.com/"$core_tap"/master/Formula/ca-certificates.rb
|
|
||||||
for extension in "${extensions_array[@]}"; do
|
for extension in "${extensions_array[@]}"; do
|
||||||
IFS=' ' read -r -a dependency_array <<<"$(get_dependencies "$extension")"
|
IFS=' ' read -r -a dependency_array <<<"$(get_dependencies "$extension")"
|
||||||
IFS=' ' read -r -a extension_array <<<"$(echo "${dependency_array[@]}" | grep -Eo "[a-z]*@" | sed 's/@//' | tr '\n' ' ')"
|
IFS=' ' read -r -a extension_array <<<"$(echo "${dependency_array[@]}" | grep -Eo "[a-z]*@" | sed 's/@//' | tr '\n' ' ')"
|
||||||
|
|||||||
Reference in New Issue
Block a user