cache-extensions 1.8.1 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-extensions",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "private": false,
   "description": "Cache PHP extensions in GitHub Actions",
   "main": "lib/cache.js",
@@ -36,26 +36,26 @@
   "license": "MIT",
   "dependencies": {
     "@actions/cache": "^3.0.4",
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "setup-php": "2.21.2"
   },
   "devDependencies": {
-    "@types/jest": "^28.1.7",
-    "@types/node": "^18.7.6",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
+    "@types/jest": "^29.1.2",
+    "@types/node": "^18.8.4",
+    "@typescript-eslint/eslint-plugin": "^5.40.0",
+    "@typescript-eslint/parser": "^5.40.0",
     "@vercel/ncc": "^0.34.0",
-    "eslint": "^8.22.0",
+    "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.8.3",
+    "eslint-plugin-jest": "^27.1.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^28.1.3",
-    "jest-circus": "^28.1.3",
+    "jest": "^29.1.2",
+    "jest-circus": "^29.1.2",
     "prettier": "^2.7.1",
-    "ts-jest": "^28.0.8",
-    "typescript": "^4.7.4"
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.8.4"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/cache-extensions/issues"

package/src/lists/darwin-extensions

@@ -19,5 +19,8 @@ redis
 ssh2
 swoole
 vips
+xdebug
+xdebug2
+xlswriter
 yaml
 zmq

package/src/lists/jammy-libs

@@ -510,6 +510,8 @@ libnuma1
 libobjc-11-dev
 libobjc4
 libodbc2
+libodbccr2
+libodbcinst2
 libonig5
 libopenexr-dev
 libopenexr25

package/src/scripts/cache.sh

@@ -78,7 +78,7 @@ extension_dir_linux() {
 
 data() {
   old_versions="5.[3-5]"
-  date='20211217'
+  date='20220831'
   if [ "$os" = "Linux" ]; then
     . /etc/lsb-release
     os=$os-$DISTRIB_CODENAME
@@ -86,8 +86,6 @@ data() {
     dir=$(extension_dir_linux "$api_version")
     sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
   elif [ "$os" = "Darwin" ]; then
-    [[ "$extensions" == *"vips"* ]] && date='20220224'
-    [[ "$extensions" =~ .*((pecl_)?http|mongodb).* ]] && date='20220304'
     api_version=$(get_api_version)
     dir=$(extension_dir_darwin "$api_version")
     sudo mkdir -p "$dir/deps" && fix_ownership "$dir"
@@ -100,8 +98,8 @@ data() {
   key="$os"-"$version"-"$key"-"$date"
   echo "$dir" > "${RUNNER_TEMP:?}"/dir
   echo "$key" > "${RUNNER_TEMP:?}"/key
-  echo "::set-output name=dir::$dir"
-  echo "::set-output name=key::$key"
+  echo "dir=$dir" >> ${GITHUB_OUTPUT:?}
+  echo "key=$key" >> ${GITHUB_OUTPUT:?}
 }
 
 dependencies() {

package/src/scripts/darwin.sh

@@ -29,10 +29,12 @@ get_dependencies() {
   formula_file="$tap_dir/$ext_tap/Formula/$extension@${version:?}.rb"
   if [ -e "$formula_file" ]; then
     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
   deps=()
   [[ -n "${list_deps[*]}" ]] && deps+=("${list_deps[@]}")
   [[ -n "${formula_deps[*]}" ]] && deps+=("${formula_deps[@]}")
+  [[ -n "${formula_deps_from_macos[*]}" ]] && deps+=("${formula_deps_from_macos[@]}")
   echo "${deps[@]}"
 }
 
@@ -117,6 +119,9 @@ restore_library_helper() {
   if ! [ -d "$brew_prefix/opt/$dep_name" ]; then
     brew link --force --overwrite "$dep_name" 2>/dev/null || true
   fi
+  if ! [ -d "$brew_prefix/opt/$dep_name" ]; then
+    sudo ln -sf "$brew_cellar"/"$dep_name"/* "$brew_prefix"/opt/"$dep_name"
+  fi  
 }
 
 restore_library() {
@@ -157,9 +162,7 @@ setup_dependencies() {
   IFS=' ' read -r -a extensions_array <<<"$(filter_extensions "${extensions_array[@]}")"
   if [[ -n "${extensions_array[*]// /}" ]]; then
     add_brew_tap "$php_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
+    add_brew_tap "$ext_tap"        
     for extension in "${extensions_array[@]}"; do
       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' ' ')"

package/src/scripts/linux.sh

@@ -7,8 +7,8 @@ link_apt_fast() {
 fetch_package() {
   if ! [ -e /tmp/Packages ]; then
     . /etc/os-release
-    deb_build_arch=$(dpkg-architecture -q DEB_BUILD_ARCH)
-    curl -o /tmp/Packages.gz -sL "http://ppa.launchpad.net/ondrej/php/ubuntu/dists/$VERSION_CODENAME/main/binary-$deb_build_arch/Packages.gz"
+    arch=$(dpkg --print-architecture)
+    curl -o /tmp/Packages.gz -sL "http://ppa.launchpad.net/ondrej/php/ubuntu/dists/$VERSION_CODENAME/main/binary-$arch/Packages.gz"
     gzip -df /tmp/Packages.gz
   fi
 }
@@ -98,6 +98,7 @@ setup_dependencies() {
   libraries=""
   extension_packages=""
   for extension_package in "${extensions_array[@]}"; do
+    [[ ! "$extension_package" =~ php[0-9]+\.[0-9]+-[a-zA-Z]+$ ]] && continue
     fetch_package
     libraries="$libraries $(get_dependencies "$extension_package" "lib")"
     IFS=' ' read -r -a dependency_extension_packages_array <<<"$(get_dependencies "$extension_package" "php$version-")"