setup-php 2.30.0 → 2.30.1

package/README.md

@@ -71,11 +71,12 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 | Virtual environment | YAML workflow label                | Pre-installed PHP      |
 |---------------------|------------------------------------|------------------------|
 | Ubuntu 22.04        | `ubuntu-latest` or `ubuntu-22.04`  | `PHP 8.1`              |
-| Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.2` |
-| Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.2`              |
-| Windows Server 2019 | `windows-2019`                     | `PHP 8.2`              |
-| macOS Ventura 13.x  | `macos-13`                         | `PHP 8.2`              |
-| macOS Monterey 12.x | `macos-latest` or `macos-12`       | `PHP 8.2`              |
+| Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.3` |
+| Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.3`              |
+| Windows Server 2019 | `windows-2019`                     | `PHP 8.3`              |
+| macOS Sonoma 14.x   | `macos-14`                         | -                      |
+| macOS Ventura 13.x  | `macos-13`                         | `PHP 8.3`              |
+| macOS Monterey 12.x | `macos-latest` or `macos-12`       | `PHP 8.3`              |
 
 ### Self-Hosted Runners
 
@@ -116,7 +117,7 @@ On all supported OS/Platforms the following PHP versions can be set up as per th
 | `8.0`       | `Stable`  | `End of life`         | `GitHub-hosted`, `self-hosted` |
 | `8.1`       | `Stable`  | `Security fixes only` | `GitHub-hosted`, `self-hosted` |
 | `8.2`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
-| `8.3`       | `Stable` | `Active`              | `GitHub-hosted`, `self-hosted` |
+| `8.3`       | `Stable`  | `Active`              | `GitHub-hosted`, `self-hosted` |
 | `8.4`       | `Nightly` | `In development`      | `GitHub-hosted`, `self-hosted` |
 
 **Notes:**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.30.0",
+  "version": "2.30.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -19,7 +19,7 @@
     "lint": "eslint **/src/*.ts **/__tests__/*.ts --cache --fix",
     "format": "prettier --write **/src/*.ts **/__tests__/*.ts && git add -f __tests__/ ",
     "format-check": "prettier --check **/src/*.ts **/__tests__/*.ts",
-    "release": "ncc build -o dist && git add -f dist/",
+    "release": "ncc build -m -o dist && git add -f dist/",
     "test": "jest"
   },
   "repository": {
@@ -41,9 +41,9 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.24",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@types/node": "^20.11.30",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
@@ -54,9 +54,9 @@
     "jest-circus": "^29.7.0",
     "nock": "^13.5.4",
     "prettier": "^3.2.5",
-    "simple-git-hooks": "^2.9.0",
+    "simple-git-hooks": "^2.11.0",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.3"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

package/src/scripts/darwin.sh

@@ -113,17 +113,6 @@ add_pecl() {
   add_log "${tick:?}" "PECL" "Found PECL $pear_version"
 }
 
-# Function to link all libraries of a formula.
-link_libraries() {
-  formula=$1
-  formula_prefix="$(brew --prefix "$formula")"
-  sudo mkdir -p "$formula_prefix"/lib
-  for lib in "$formula_prefix"/lib/*.dylib; do
-    lib_name=$(basename "$lib")
-    sudo cp -a "$lib" "$brew_prefix/lib/$lib_name" 2>/dev/null || true
-  done
-}
-
 # Link opcache extension to extensions directory.
 link_opcache() {
   opcache_ini="$brew_prefix"/etc/php/"$version"/conf.d/ext-opcache.ini
@@ -142,34 +131,15 @@ patch_brew() {
   trap "sudo sed -Ei '' 's/$code.*/$code, overwrite: overwrite?\)/' $formula_installer" exit
 }
 
-# Helper function to update the dependencies.
-update_dependencies_helper() {
-  dependency=$1
-  [[ "${dependency:0:3}" = "lib" ]] && prefix=lib || prefix="${dependency:0:1}"
-  get -q -n "$core_repo/Formula/$prefix/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$prefix/$dependency.rb"
-  link_libraries "$dependency"
-}
-
 # Function to update dependencies.
 update_dependencies() {
   patch_brew
   if ! [ -e /tmp/update_dependencies ]; then
-    git -C "$core_repo" fetch origin master && git -C "$core_repo" reset --hard origin/master
+    git_retry -C "$core_repo" fetch origin master && git -C "$core_repo" reset --hard origin/master
     echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
   fi
 }
 
-# Function to fix dependencies on install PHP version.
-fix_dependencies() {
-  broken_deps_paths=$(php -v 2>&1 | grep -Eo '/opt/[a-zA-Z0-9@\.]+')
-  if [ "x$broken_deps_paths" != "x" ]; then
-    update_dependencies
-    IFS=" " read -r -a formulae <<< "$(echo "$broken_deps_paths" | tr '\n' ' ' | sed 's|/opt/||g' 2>&1)$php_formula"
-    brew reinstall "${formulae[@]}"
-    brew link --force --overwrite "$php_formula" || true
-  fi
-}
-
 # Function to get PHP version if it is already installed using Homebrew.
 get_brewed_php() {
   cellar="$brew_prefix"/Cellar
@@ -251,8 +221,8 @@ setup_php() {
     add_php "upgrade" "$existing_version" >/dev/null 2>&1
     status="Updated to"
   else
-    status="Found"
-    fix_dependencies >/dev/null 2>&1
+    add_php "upgrade" "$existing_version" >/dev/null 2>&1
+    status="Updated to"
   fi
   php_config="$(command -v php-config)"
   ext_dir="$(grep 'extension_dir=' "$php_config" | cut -d "'" -f 2)"
@@ -294,6 +264,7 @@ export HOMEBREW_NO_INSTALL_FROM_API=1
 # shellcheck source=.
 . "${scripts:?}"/unix.sh
 . "${scripts:?}"/tools/brew.sh
+. "${scripts:?}"/tools/retry.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/extensions/source.sh
 . "${scripts:?}"/extensions/add_extensions.sh

package/src/scripts/extensions/oci.sh

@@ -39,9 +39,13 @@ add_oci_helper() {
     status='Installed and enabled'
     read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
     read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
-    read -r "${ext}_PATH" <<< "ext/$ext"
     patch_phpize
-    add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
+    if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
+      add_extension_from_source "$ext" https://github.com php pecl-database-"$ext" main extension get
+    else
+      read -r "${ext}_PATH" <<< "ext/$ext"
+      add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
+    fi
     restore_phpize
   else
     enable_extension "$ext" extension

package/src/scripts/extensions/phalcon.ps1

@@ -8,19 +8,36 @@ Function Get-PhalconReleaseAssetUrl() {
   )
   $domain = 'https://api.github.com/repos'
   $releases = 'phalcon/cphalcon/releases'
+  $match = $null
   if($extension_version -match '[3-4]') {
     $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
     try {
       $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
-    } catch {
-      $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
+    } catch { }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon_${arch}_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)"
+      } catch { }
     }
   } else {
     $nts = if (!$installed.ThreadSafe) { "-nts" } else { "-ts" }
     try {
-      $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)"
-    } catch {
-      $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
+    } catch { }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(php_phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
+    }
+    if($null -eq $match) {
+      try {
+        $match = (Invoke-RestMethod -Uri "$domain/$releases/tags/v$Semver").assets | Select-String -Pattern "browser_download_url=.*(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
+    }
+    if($null -eq $match) {
+      try {
+        $match = (Get-File -Url "$github/$releases/expanded_assets/v$Semver").Links.href | Select-String -Pattern "(phalcon-php${version}${nts}-windows.*-x64.zip)"
+      } catch { }
     }
   }
   if($NULL -ne $match) {
@@ -54,6 +71,8 @@ Function Get-PhalconSemver() {
     return '3.4.5'
   } elseif (($extension_version -eq '4') -and ($version -eq '7.2')) {
     return '4.1.0'
+  } elseif (($extension_version -eq '5') -and ($version -eq '7.4')) {
+    return '5.4.0'
   }
   return Get-PeclPackageVersion phalcon $extension_version stable stable | Select-Object -First 1
 }

package/src/scripts/extensions/sqlsrv.ps1

@@ -7,6 +7,8 @@ Function Get-SqlsrvReleaseVersion() {
     return '5.9.0'
   } elseif ($version -eq '7.4') {
     return '5.10.1'
+  } elseif ($version -eq '8.0') {
+    return '5.11.1'
   } else {
     return 'latest'
   }

package/src/scripts/extensions/sqlsrv.sh

@@ -4,6 +4,8 @@ get_sqlsrv_version() {
     echo '5.9.0'
   elif [[ "${version:?}" =~ 7.4 ]]; then
     echo '5.10.1'
+  elif [[ "${version:?}" =~ 8.0 ]]; then
+    echo '5.11.1'
   else
     # Return an empty string so that pecl will install the latest version.
     echo ''

package/src/scripts/tools/retry.sh

@@ -0,0 +1,20 @@
+function retry {
+    local try=0
+
+    until "$@"; do
+        exit_code="$?"
+        try=$((try + 1))
+
+        if [ $try -lt 10 ]; then
+            sleep "$((2 ** try))"
+        else
+            return $exit_code
+        fi
+    done
+
+    return 0
+}
+
+function git_retry {
+    retry git "$@"
+}

package/src/scripts/win32.ps1

@@ -133,14 +133,14 @@ Function Get-File {
   param (
     [string]$Url,
     [string]$FallbackUrl,
-    [string]$OutFile,
+    [string]$OutFile = '',
     [int]$Retries = 3,
     [int]$TimeoutSec = 0
   )
 
   for ($i = 0; $i -lt $Retries; $i++) {
     try {
-      if($null -ne $OutFile) {
+      if($OutFile -ne '') {
         Invoke-WebRequest -Uri $Url -OutFile $OutFile -TimeoutSec $TimeoutSec
       } else {
         Invoke-WebRequest -Uri $Url -TimeoutSec $TimeoutSec
@@ -150,7 +150,7 @@ Function Get-File {
       if ($i -eq ($Retries - 1)) {
         if($FallbackUrl) {
           try {
-            if($null -ne $OutFile) {
+            if($OutFile -ne '') {
               Invoke-WebRequest -Uri $FallbackUrl -OutFile $OutFile -TimeoutSec $TimeoutSec
             } else {
               Invoke-WebRequest -Uri $FallbackUrl -TimeoutSec $TimeoutSec