setup-php 2.32.0 → 2.34.0

package/src/scripts/unix.sh

@@ -53,8 +53,11 @@ read_env() {
   [ "${debug:-${DEBUG:-false}}" = "true" ] && debug=debug && update=true || debug=release
   [[ "${phpts:-${PHPTS:-nts}}" = "ts" || "${phpts:-${PHPTS:-nts}}" = "zts" ]] && ts=zts && update=true || ts=nts
   fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
-  [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github
+  [[ ( -z "$ImageOS" && -z "$ImageVersion" ) ||
+     ( -n "$RUNNER_ENVIRONMENT" && "$RUNNER_ENVIRONMENT" = "self-hosted" ) ||
+     -n "$ACT" || -n "$CONTAINER" ]] && _runner=self-hosted || _runner=github
   runner="${runner:-${RUNNER:-$_runner}}"
+  tool_path_dir="${setup_php_tools_dir:-${SETUP_PHP_TOOLS_DIR:-/usr/local/bin}}"
 
   if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then
     fail_fast=true
@@ -75,6 +78,45 @@ read_env() {
   export runner
   export update
   export ts
+  export tool_path_dir
+}
+
+# Function to create a lock.
+acquire_lock() {
+  lock_path="$1"
+  while true; do
+    if sudo mkdir "$lock_path" 2>/dev/null; then
+      echo $$ | sudo tee "$lock_path/pid" >/dev/null
+      return 0
+    else
+      if sudo test -f "$lock_path/pid"; then
+        lock_pid=$(sudo cat "$lock_path/pid")
+        if ! ps -p "$lock_pid" >/dev/null 2>&1; then
+          sudo rm -rf "$lock_path"
+          continue
+        fi
+      fi
+      sleep 1
+    fi
+  done
+}
+
+# Function to release the lock.
+release_lock() {
+  lock_path="$1"
+  sudo rm -rf "$lock_path"
+}
+
+# Function to get the SHA256 hash of a string.
+get_sha256() {
+  local input=$1
+  if command -v sha256sum >/dev/null 2>&1; then
+    printf '%s' "$input" | sha256sum | cut -d' ' -f1
+  elif command -v shasum >/dev/null 2>&1; then
+    printf '%s' "$input" | shasum -a 256 | cut -d' ' -f1
+  elif command -v openssl >/dev/null 2>&1; then
+    printf '%s' "$input" | openssl dgst -sha256 | cut -d' ' -f2
+  fi
 }
 
 # Function to download a file using cURL.
@@ -89,23 +131,23 @@ get() {
   if [ "$mode" = "-s" ]; then
     sudo curl "${curl_opts[@]}" "${links[0]}"
   else
-    lock_path="$file_path.lock"
-    until sudo mkdir "$lock_path" 2>/dev/null; do
-      sleep 1
-    done
-    if [ "$execute" = "-e" ]; then
-      until [ -z "$(fuser "$file_path" 2>/dev/null)" ]; do
-        sleep 1
-      done
+    if [ "$runner" = "self-hosted" ]; then
+      lock_path="/tmp/sp-lck-$(get_sha256 "$file_path")"
+      acquire_lock "$lock_path"
+      if [ "$execute" = "-e" ]; then
+        until [ -z "$(fuser "$file_path" 2>/dev/null)" ]; do
+          sleep 1
+        done
+      fi
+      trap 'release_lock "$lock_path"' EXIT SIGINT SIGTERM
     fi
-    trap 'sudo rm -rf "$lock_path"' EXIT SIGINT SIGTERM
     for link in "${links[@]}"; do
       status_code=$(sudo curl -w "%{http_code}" -o "$file_path" "${curl_opts[@]}" "$link")
       [ "$status_code" = "200" ] && break
     done
     [ "$execute" = "-e" ] && sudo chmod a+x "$file_path"
     [ "$mode" = "-v" ] && echo "$status_code"
-    sudo rm -rf "$lock_path" >/dev/null 2>&1 || true
+    [ "$runner" = "self-hosted" ] && release_lock "$lock_path"
   fi
 }
 

package/src/tools.ts

@@ -401,6 +401,9 @@ export async function addPhive(data: RS): Promise<string> {
     case /7\.2/.test(data['php_version']):
       data['version'] = '0.14.5';
       break;
+    case /7\.3|7\.4/.test(data['php_version']):
+      data['version'] = '0.15.3';
+      break;
     case /^latest$/.test(data['version']):
       data['version'] = await getLatestVersion(data);
       break;
@@ -422,6 +425,9 @@ export async function addPHPUnitTools(data: RS): Promise<string> {
       'latest';
   }
   data['url'] = await getPharUrl(data);
+  if (data['url'].match(/-\d+/)) {
+    data['url'] += ',' + data['url'].replace(/-(\d+)\.\d+\.\d+/, '-$1');
+  }
   return await addArchive(data);
 }
 

package/src/utils.ts

@@ -48,8 +48,11 @@ export async function getInput(
 /**
  * Function to get manifest URL
  */
-export async function getManifestURL(): Promise<string> {
-  return 'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
+export async function getManifestURLS(): Promise<string[]> {
+  return [
+    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json',
+    'https://setup-php.com/php-versions.json'
+  ];
 }
 
 /**
@@ -60,9 +63,13 @@ export async function getManifestURL(): Promise<string> {
 export async function parseVersion(version: string): Promise<string> {
   switch (true) {
     case /^(latest|lowest|highest|nightly|\d+\.x)$/.test(version):
-      return JSON.parse((await fetch.fetch(await getManifestURL()))['data'])[
-        version
-      ];
+      for (const manifestURL of await getManifestURLS()) {
+        const fetchResult = await fetch.fetch(manifestURL);
+        if (fetchResult['data'] ?? false) {
+          return JSON.parse(fetchResult['data'])[version];
+        }
+      }
+      throw new Error(`Could not fetch the PHP version manifest.`);
     default:
       switch (true) {
         case version.length > 1: