cache-extensions 1.13.0 → 1.15.0

package/README.md

@@ -4,7 +4,7 @@
   <a href="https://github.com/shivammathur/cache-extensions" title="Cache PHP extensions in GitHub Actions"><img alt="GitHub Actions status" src="https://github.com/shivammathur/cache-extensions/workflows/Node%20test%20workflow/badge.svg"></a>
   <a href="https://codecov.io/gh/shivammathur/cache-extensions" title="Code coverage"><img alt="Codecov Code Coverage" src="https://codecov.io/gh/shivammathur/cache-extensions/branch/master/graph/badge.svg"></a>
   <a href="https://github.com/shivammathur/cache-extensions/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
-  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.5-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.6-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
 </p>
 
 Cache PHP extensions in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action has to be used along with [shivammathur/setup-php](https://github.com/shivammathur/setup-php "Setup PHP") and [actions/cache](https://github.com/actions/cache "Cache in GitHub Actions") GitHub Actions. It configures the environment required to cache PHP extensions. Refer to [Usage](#memo-usage "How to use this") section for details and example workflow.
@@ -15,6 +15,7 @@ Cache PHP extensions in [GitHub Actions](https://github.com/features/actions "Gi
 - [OS/Platform Support](#cloud-osplatform-support)
 - [Usage](#memo-usage)
   - [Inputs](#inputs)
+  - [Flags](#flags)
   - [Workflow](#workflow)
   - [Thread Safe Setup](#thread-safe-setup)
 - [License](#scroll-license)
@@ -24,23 +25,24 @@ Cache PHP extensions in [GitHub Actions](https://github.com/features/actions "Gi
 
 ## :tada: PHP Support
 
-|PHP Version|Stability|Release Support|
-|--- |--- |--- |
-|5.3|`Stable`|`End of life`|
-|5.4|`Stable`|`End of life`|
-|5.5|`Stable`|`End of life`|
-|5.6|`Stable`|`End of life`|
-|7.0|`Stable`|`End of life`|
-|7.1|`Stable`|`End of life`|
-|7.2|`Stable`|`End of life`|
-|7.3|`Stable`|`End of life`|
-|7.4|`Stable`|`End of life`|
-|8.0|`Stable`|`End of life`|
-|8.1|`Stable`|`Security fixes only`|
-|8.2|`Stable`|`Security fixes only`|
-|8.3|`Stable`|`Active`|
-|8.4|`Stable`|`Active`|
-|8.5|`Nightly`|`In development`|
+| PHP Version |Stability|Release Support|
+|-------------|--- |--- |
+| 5.3         |`Stable`|`End of life`|
+| 5.4         |`Stable`|`End of life`|
+| 5.5         |`Stable`|`End of life`|
+| 5.6         |`Stable`|`End of life`|
+| 7.0         |`Stable`|`End of life`|
+| 7.1         |`Stable`|`End of life`|
+| 7.2         |`Stable`|`End of life`|
+| 7.3         |`Stable`|`End of life`|
+| 7.4         |`Stable`|`End of life`|
+| 8.0         |`Stable`|`End of life`|
+| 8.1         |`Stable`|`Security fixes only`|
+| 8.2         |`Stable`|`Security fixes only`|
+| 8.3         |`Stable`|`Active`|
+| 8.4         |`Stable`|`Active`|
+| 8.5         |`Stable`|`Active`|
+| 8.6         |`Nightly`|`In development`|
 
 ## :cloud: OS/Platform Support
 
@@ -52,10 +54,11 @@ Cache PHP extensions in [GitHub Actions](https://github.com/features/actions "Gi
 | Ubuntu 22.04        | aarch64 | `ubuntu-22.04-arm`                 |
 | Windows Server 2025 | x64     | `windows-2025`                     |
 | Windows Server 2022 | x64     | `windows-latest` or `windows-2022` |
-| Windows Server 2019 | x64     | `windows-2019`                     |
-| macOS Sequoia 15.x  | arm64   | `macos-15`                         |
-| macOS Sonoma 14.x   | arm64   | `macos-latest` or `macos-14`       |
-| macOS Ventura 13.x  | x86_64  | `macos-13`                         |
+| macOS Tahoe 26.x    | arm64   | `macos-26`                         |
+| macOS Sequoia 15.x  | arm64   | `macos-latest` or `macos-15`       |
+| macOS Sonoma 14.x   | arm64   | `macos-14`                         |
+| macOS Tahoe 26.x    | x86_64  | `macos-26-intel`                   |
+| macOS Sequoia 15.x  | x86_64  | `macos-15-intel`                   |
 
 **Note**: Support for self-hosted runners for the above operating systems is in beta. If you use this action on a self-hosted runner, please report any issues you find.
 
@@ -68,7 +71,7 @@ Use this GitHub Action when the extensions you are adding in [setup-php](https:/
 #### `php-version` (optional)
 
 - Specify the PHP version you want to set up.
-- Accepts a `string`. For example `'8.0'`.
+- Accepts a `string`. For example `'8.5'`.
 - Accepts `latest` to set up the latest stable PHP version.
 - Accepts `nightly` to set up a nightly build from the master branch of PHP.
 - Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`.
@@ -97,6 +100,34 @@ Use this GitHub Action when the extensions you are adding in [setup-php](https:/
 
 See [action.yml](action.yml "Metadata for this GitHub Action") and usage below for more info.
 
+### Flags
+
+> Specify using the `env` keyword
+
+#### `share-cache-across-jobs` (optional)
+
+- Specify `true` to share the cache across jobs in the same workflow.
+- By default, it is set to `false` and the job ID is included in the cache key.
+
+#### `share-cache-across-workflows` (optional)
+
+- Specify `true` to share the cache across workflows for the same job ID.
+- By default, it is set to `false` and the workflow ID is included in the cache key.
+- Enable both flags to share the cache across all jobs and workflows in the repository.
+
+```yaml
+- name: Setup cache environment
+  id: extcache
+  uses: shivammathur/cache-extensions@v1
+  with:
+    php-version: ${{ matrix.php-versions }}
+    extensions: ${{ env.extensions }}
+    key: ${{ env.key }}
+  env:
+    share-cache-across-jobs: true
+    share-cache-across-workflows: true
+```
+
 ### Workflow
 
 > Cache extensions in a PHP workflow
@@ -108,14 +139,14 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+        php-versions: ['8.3', '8.4', '8.5']
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     env:
       extensions: intl, pcov
       key: cache-v1 # can be any string, change to clear the extension cache.
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Setup cache environment
       id: extcache

package/lib/cache.d.ts

@@ -1,2 +1,8 @@
-export declare function handleDependencies(extensions: string, version: string): Promise<void>;
+export declare function getErrorMessage(error: unknown): string;
+export declare function normalizeModulePath(path: string): string;
+export declare function shouldHandleDependencies(version: string, platform?: NodeJS.Platform): boolean;
+export declare function handleDependencies(extensions: string, version: string, platform?: NodeJS.Platform): Promise<void>;
 export declare function run(): Promise<void>;
+export declare function main(runAction?: () => Promise<void>): Promise<void>;
+export declare function isMainModule(argv1?: string | undefined, moduleUrl?: string): boolean;
+export declare function bootstrap(argv1?: string | undefined, moduleUrl?: string, runAction?: () => Promise<void>): Promise<void>;

package/lib/cache.js

@@ -1,86 +1,91 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
+import { exec } from '@actions/exec';
+import * as cache from '@actions/cache';
+import * as core from '@actions/core';
+import * as spu from 'setup-php/lib/utils.js';
+import { existsSync, realpathSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import * as utils from './utils.js';
+const DEPENDENCY_CACHE_DIR = 'deps';
+const DEPENDENCY_CACHE_PLATFORMS = new Set([
+    'darwin',
+    'linux'
+]);
+const SKIP_DEPENDENCY_CACHE_VERSIONS = /^5\.[3-5]$/;
+export function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+export function normalizeModulePath(path) {
+    const resolvedPath = resolve(path);
+    return existsSync(resolvedPath) ? realpathSync(resolvedPath) : resolvedPath;
+}
+export function shouldHandleDependencies(version, platform = process.platform) {
+    return (!SKIP_DEPENDENCY_CACHE_VERSIONS.test(version) &&
+        DEPENDENCY_CACHE_PLATFORMS.has(platform));
+}
+export async function handleDependencies(extensions, version, platform = process.platform) {
+    if (!shouldHandleDependencies(version, platform)) {
+        return;
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleDependencies = handleDependencies;
-exports.run = run;
-const exec_1 = require("@actions/exec");
-const cache = __importStar(require("@actions/cache"));
-const core = __importStar(require("@actions/core"));
-const spu = __importStar(require("setup-php/lib/utils"));
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const utils = __importStar(require("./utils"));
-async function handleDependencies(extensions, version) {
-    if (!/^5.[3-5]$/.test(version) && /linux|darwin/.test(process.platform)) {
-        const cache_key = (await utils.getOutput('key')) + '-deps';
-        const cache_dir = path.join(await spu.readEnv('RUNNER_TOOL_CACHE'), 'deps');
-        const cache_hit = await cache.restoreCache([cache_dir], cache_key, [cache_key]);
-        await (0, exec_1.exec)(await utils.scriptCall('dependencies', extensions, version));
-        if (!cache_hit && fs.existsSync(cache_dir)) {
-            try {
-                await cache.saveCache([cache_dir], cache_key);
-            }
-            catch {
-                await cache.saveCache([cache_dir], cache_key + '-take-2');
-            }
-        }
+    const cacheKey = `${await utils.getOutput('key')}-deps`;
+    const cacheDir = join(await spu.readEnv('RUNNER_TOOL_CACHE'), DEPENDENCY_CACHE_DIR);
+    const cacheHit = await cache.restoreCache([cacheDir], cacheKey, [cacheKey]);
+    const dependencyScript = utils.scriptCall('dependencies', extensions, version);
+    await exec(dependencyScript.command, dependencyScript.args);
+    if (cacheHit || !existsSync(cacheDir)) {
+        return;
+    }
+    try {
+        await cache.saveCache([cacheDir], cacheKey);
+    }
+    catch {
+        await cache.saveCache([cacheDir], `${cacheKey}-take-2`);
     }
 }
-async function run() {
+export async function run() {
     try {
         const version = await spu.parseVersion(await spu.readPHPVersion());
-        const extensions = await utils.filterExtensions(await spu.getInput('extensions', true));
+        const extensions = utils.filterExtensions(await spu.getInput('extensions', true));
         const key = await spu.getInput('key', true);
-        await (0, exec_1.exec)(await utils.scriptCall('data', extensions, version, key));
+        const shareCacheAcrossJobs = (await spu.readEnv('share-cache-across-jobs')) === 'true'
+            ? 'true'
+            : 'false';
+        const shareCacheAcrossWorkflows = (await spu.readEnv('share-cache-across-workflows')) === 'true'
+            ? 'true'
+            : 'false';
+        const dataScript = utils.scriptCall('data', extensions, version, key, shareCacheAcrossJobs, shareCacheAcrossWorkflows);
+        await exec(dataScript.command, dataScript.args);
         await handleDependencies(extensions, version);
     }
     catch (error) {
-        core.setFailed(error.message);
+        core.setFailed(getErrorMessage(error));
     }
 }
-(async () => {
-    await run();
-})().catch(error => {
-    if (error.name === cache.ValidationError.name) {
-        core.setFailed(error.message);
+export async function main(runAction = run) {
+    try {
+        await runAction();
     }
-    else if (error.name === cache.ReserveCacheError.name) {
-        core.info(error.message);
+    catch (error) {
+        const message = getErrorMessage(error);
+        if (error instanceof cache.ValidationError) {
+            core.setFailed(message);
+            return;
+        }
+        if (error instanceof cache.ReserveCacheError) {
+            core.info(message);
+            return;
+        }
+        core.warning(message);
     }
-    else {
-        core.warning(error.message);
+}
+export function isMainModule(argv1 = process.argv[1], moduleUrl = import.meta.url) {
+    return (!!argv1 &&
+        normalizeModulePath(argv1) === normalizeModulePath(fileURLToPath(moduleUrl)));
+}
+export async function bootstrap(argv1 = process.argv[1], moduleUrl = import.meta.url, runAction = main) {
+    if (isMainModule(argv1, moduleUrl)) {
+        await runAction();
     }
-});
+}
+await bootstrap();
 //# sourceMappingURL=cache.js.map

package/lib/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,gDAwBC;AAKD,kBAYC;AAvDD,wCAAmC;AACnC,sDAAwC;AACxC,oDAAsC;AACtC,yDAA2C;AAC3C,uCAAyB;AACzB,2CAA6B;AAC7B,+CAAiC;AAQ1B,KAAK,UAAU,kBAAkB,CACtC,UAAkB,EAClB,OAAe;IAEf,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxE,MAAM,SAAS,GAAW,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC;QACnE,MAAM,SAAS,GAAW,IAAI,CAAC,IAAI,CACjC,MAAM,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,EACtC,MAAM,CACP,CAAC;QACF,MAAM,SAAS,GAAuB,MAAM,KAAK,CAAC,YAAY,CAC5D,CAAC,SAAS,CAAC,EACX,SAAS,EACT,CAAC,SAAS,CAAC,CACZ,CAAC;QACF,MAAM,IAAA,WAAI,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,cAAc,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAKM,KAAK,UAAU,GAAG;IACvB,IAAI,CAAC;QACH,MAAM,OAAO,GAAW,MAAM,GAAG,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3E,MAAM,UAAU,GAAW,MAAM,KAAK,CAAC,gBAAgB,CACrD,MAAM,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CACvC,CAAC;QACF,MAAM,GAAG,GAAW,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,IAAA,WAAI,EAAC,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACrE,MAAM,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,SAAS,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAGD,CAAC,KAAK,IAAI,EAAE;IACV,MAAM,GAAG,EAAE,CAAC;AACd,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;IACjB,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}

package/lib/utils.d.ts

@@ -1,3 +1,8 @@
+export declare const SCRIPT_PATH: string;
+export type ScriptCall = {
+    command: 'bash';
+    args: [string, string, ...string[]];
+};
 export declare function getOutput(output: string): Promise<string>;
-export declare function filterExtensions(extension_csv: string): Promise<string>;
-export declare function scriptCall(fn: string, ...args: string[]): Promise<string>;
+export declare function filterExtensions(extension_csv: string): string;
+export declare function scriptCall(fn: string, ...args: string[]): ScriptCall;

package/lib/utils.js

@@ -1,57 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOutput = getOutput;
-exports.filterExtensions = filterExtensions;
-exports.scriptCall = scriptCall;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const spu = __importStar(require("setup-php/lib/utils"));
-async function getOutput(output) {
-    return fs.readFileSync(path.join(await spu.readEnv('RUNNER_TEMP'), output), 'utf8');
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import * as spu from 'setup-php/lib/utils.js';
+export const SCRIPT_PATH = join(import.meta.dirname, '../src/scripts/cache.sh');
+export async function getOutput(output) {
+    return readFile(join(await spu.readEnv('RUNNER_TEMP'), output), 'utf8');
 }
-async function filterExtensions(extension_csv) {
-    return JSON.stringify(extension_csv
+export function filterExtensions(extension_csv) {
+    return extension_csv
         .split(',')
         .filter(extension => {
         return extension.trim()[0] != ':';
     })
-        .join(','));
+        .join(',');
 }
-async function scriptCall(fn, ...args) {
-    const script = path.join(__dirname, '../src/scripts/cache.sh');
-    return ['bash', script, fn, ...args].join(' ');
+export function scriptCall(fn, ...args) {
+    return {
+        command: 'bash',
+        args: [SCRIPT_PATH, fn, ...args]
+    };
 }
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,8BAKC;AAOD,4CASC;AAQD,gCAMC;AA1CD,uCAAyB;AACzB,2CAA6B;AAC7B,yDAA2C;AAKpC,KAAK,UAAU,SAAS,CAAC,MAAc;IAC5C,OAAO,EAAE,CAAC,YAAY,CACpB,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,EACnD,MAAM,CACP,CAAC;AACJ,CAAC;AAOM,KAAK,UAAU,gBAAgB,CAAC,aAAqB;IAC1D,OAAO,IAAI,CAAC,SAAS,CACnB,aAAa;SACV,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,SAAS,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;IACpC,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC;AAQM,KAAK,UAAU,UAAU,CAC9B,EAAU,EACV,GAAG,IAAc;IAEjB,MAAM,MAAM,GAAW,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IACvE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAC/B,OAAO,KAAK,GAAG,MAAM,wBAAwB,CAAC;AAE9C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;AAUhF,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc;IAC5C,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAC1E,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,aAAqB;IACpD,OAAO,aAAa;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,SAAS,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;IACpC,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAQD,MAAM,UAAU,UAAU,CAAC,EAAU,EAAE,GAAG,IAAc;IACtD,OAAO;QACL,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;KACjC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "cache-extensions",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "private": false,
   "description": "Cache PHP extensions in GitHub Actions",
+  "type": "module",
+  "engines": {
+    "node": ">=24"
+  },
   "main": "lib/cache.js",
   "types": "lib/cache.d.ts",
   "directories": {
@@ -19,8 +23,8 @@
     "lint": "eslint **/src/*.ts --cache --fix",
     "format": "prettier --write **/src/*.ts && git add .",
     "format-check": "prettier --check **/src/*.ts",
-    "release": "ncc build -m -o dist && git add -f dist/",
-    "test": "jest"
+    "release": "ncc build src/cache.ts -m && git add -f dist/",
+    "test": "node --disable-warning=ExperimentalWarning --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "repository": {
     "type": "git",
@@ -35,31 +39,40 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^4.0.5",
-    "@actions/core": "^1.11.1",
-    "@actions/exec": "^1.1.1",
-    "setup-php": "2.35.3"
+    "@actions/cache": "^6.2.0",
+    "@actions/core": "^3.0.1",
+    "@actions/exec": "^3.0.0",
+    "setup-php": "^2.37.2"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.2",
+    "@eslint/compat": "^2.1.0",
+    "@eslint/eslintrc": "^3.3.6",
+    "@eslint/js": "^10.0.1",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.40.0",
-    "@typescript-eslint/parser": "^8.40.0",
-    "@vercel/ncc": "^0.38.3",
-    "eslint": "^9.33.0",
+    "@types/node": "^26.2.0",
+    "@typescript-eslint/eslint-plugin": "^8.67.0",
+    "@typescript-eslint/parser": "^8.67.0",
+    "@typescript/native": "npm:typescript@^7.0.2",
+    "@vercel/ncc": "^0.44.1",
+    "eslint": "^10.8.1",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.0.1",
-    "eslint-plugin-prettier": "^5.5.4",
-    "jest": "^30.0.5",
-    "jest-circus": "^30.0.5",
-    "prettier": "^3.6.2",
-    "ts-jest": "^29.4.1",
-    "typescript": "^5.9.2"
+    "eslint-import-resolver-typescript": "^4.4.5",
+    "eslint-plugin-import-x": "^4.17.1",
+    "eslint-plugin-jest": "^29.16.0",
+    "eslint-plugin-prettier": "^5.5.6",
+    "globals": "^17.9.0",
+    "jest": "^30.4.2",
+    "jest-circus": "^30.4.2",
+    "prettier": "^3.9.6",
+    "ts-jest": "^29.4.12",
+    "ts-node": "^10.9.2",
+    "typescript": "npm:@typescript/typescript6@^6.0.2"
   },
   "overrides": {
-    "test-exclude": "^7.0.1"
+    "brace-expansion@1.x": "^1.1.18",
+    "test-exclude": "^7.0.1",
+    "glob": "^13.0.6",
+    "undici": "^6.23.0"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/cache-extensions/issues"

package/src/cache.ts

@@ -1,40 +1,77 @@
 import {exec} from '@actions/exec';
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
-import * as spu from 'setup-php/lib/utils';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as utils from './utils';
+import * as spu from 'setup-php/lib/utils.js';
+import {existsSync, realpathSync} from 'node:fs';
+import {join, resolve} from 'node:path';
+import {fileURLToPath} from 'node:url';
+import * as utils from './utils.js';
+
+const DEPENDENCY_CACHE_DIR = 'deps';
+const DEPENDENCY_CACHE_PLATFORMS = new Set<NodeJS.Platform>([
+  'darwin',
+  'linux'
+]);
+const SKIP_DEPENDENCY_CACHE_VERSIONS = /^5\.[3-5]$/;
+
+export function getErrorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+export function normalizeModulePath(path: string): string {
+  const resolvedPath = resolve(path);
+
+  return existsSync(resolvedPath) ? realpathSync(resolvedPath) : resolvedPath;
+}
+
+export function shouldHandleDependencies(
+  version: string,
+  platform: NodeJS.Platform = process.platform
+): boolean {
+  return (
+    !SKIP_DEPENDENCY_CACHE_VERSIONS.test(version) &&
+    DEPENDENCY_CACHE_PLATFORMS.has(platform)
+  );
+}
 
 /**
  * Handle dependencies
  *
  * @param extensions
  * @param version
+ * @param platform
  */
 export async function handleDependencies(
   extensions: string,
-  version: string
+  version: string,
+  platform: NodeJS.Platform = process.platform
 ): Promise<void> {
-  if (!/^5.[3-5]$/.test(version) && /linux|darwin/.test(process.platform)) {
-    const cache_key: string = (await utils.getOutput('key')) + '-deps';
-    const cache_dir: string = path.join(
-      await spu.readEnv('RUNNER_TOOL_CACHE'),
-      'deps'
-    );
-    const cache_hit: string | undefined = await cache.restoreCache(
-      [cache_dir],
-      cache_key,
-      [cache_key]
-    );
-    await exec(await utils.scriptCall('dependencies', extensions, version));
-    if (!cache_hit && fs.existsSync(cache_dir)) {
-      try {
-        await cache.saveCache([cache_dir], cache_key);
-      } catch {
-        await cache.saveCache([cache_dir], cache_key + '-take-2');
-      }
-    }
+  if (!shouldHandleDependencies(version, platform)) {
+    return;
+  }
+
+  const cacheKey = `${await utils.getOutput('key')}-deps`;
+  const cacheDir = join(
+    await spu.readEnv('RUNNER_TOOL_CACHE'),
+    DEPENDENCY_CACHE_DIR
+  );
+  const cacheHit = await cache.restoreCache([cacheDir], cacheKey, [cacheKey]);
+  const dependencyScript = utils.scriptCall(
+    'dependencies',
+    extensions,
+    version
+  );
+
+  await exec(dependencyScript.command, dependencyScript.args);
+
+  if (cacheHit || !existsSync(cacheDir)) {
+    return;
+  }
+
+  try {
+    await cache.saveCache([cacheDir], cacheKey);
+  } catch {
+    await cache.saveCache([cacheDir], `${cacheKey}-take-2`);
   }
 }
 
@@ -43,27 +80,75 @@ export async function handleDependencies(
  */
 export async function run(): Promise<void> {
   try {
-    const version: string = await spu.parseVersion(await spu.readPHPVersion());
-    const extensions: string = await utils.filterExtensions(
+    const version = await spu.parseVersion(await spu.readPHPVersion());
+    const extensions = utils.filterExtensions(
       await spu.getInput('extensions', true)
     );
-    const key: string = await spu.getInput('key', true);
-    await exec(await utils.scriptCall('data', extensions, version, key));
+    const key = await spu.getInput('key', true);
+    const shareCacheAcrossJobs =
+      (await spu.readEnv('share-cache-across-jobs')) === 'true'
+        ? 'true'
+        : 'false';
+    const shareCacheAcrossWorkflows =
+      (await spu.readEnv('share-cache-across-workflows')) === 'true'
+        ? 'true'
+        : 'false';
+    const dataScript = utils.scriptCall(
+      'data',
+      extensions,
+      version,
+      key,
+      shareCacheAcrossJobs,
+      shareCacheAcrossWorkflows
+    );
+
+    await exec(dataScript.command, dataScript.args);
     await handleDependencies(extensions, version);
   } catch (error) {
-    core.setFailed((error as Error).message);
+    core.setFailed(getErrorMessage(error));
+  }
+}
+
+export async function main(
+  runAction: () => Promise<void> = run
+): Promise<void> {
+  try {
+    await runAction();
+  } catch (error) {
+    const message = getErrorMessage(error);
+
+    if (error instanceof cache.ValidationError) {
+      core.setFailed(message);
+      return;
+    }
+
+    if (error instanceof cache.ReserveCacheError) {
+      core.info(message);
+      return;
+    }
+
+    core.warning(message);
   }
 }
 
-// call the run function
-(async () => {
-  await run();
-})().catch(error => {
-  if (error.name === cache.ValidationError.name) {
-    core.setFailed(error.message);
-  } else if (error.name === cache.ReserveCacheError.name) {
-    core.info(error.message);
-  } else {
-    core.warning(error.message);
+export function isMainModule(
+  argv1: string | undefined = process.argv[1],
+  moduleUrl: string = import.meta.url
+): boolean {
+  return (
+    !!argv1 &&
+    normalizeModulePath(argv1) === normalizeModulePath(fileURLToPath(moduleUrl))
+  );
+}
+
+export async function bootstrap(
+  argv1: string | undefined = process.argv[1],
+  moduleUrl: string = import.meta.url,
+  runAction: () => Promise<void> = main
+): Promise<void> {
+  if (isMainModule(argv1, moduleUrl)) {
+    await runAction();
   }
-});
+}
+
+await bootstrap();

package/src/lists/darwin-extensions

@@ -0,0 +1,65 @@
+amqp
+apcu
+ast
+brotli
+couchbase
+decimal
+ds
+event
+excimer
+expect
+gearman
+gmagick
+gnupg
+grpc
+igbinary
+imagick
+imap
+interbase
+lua
+mailparse
+maxminddb
+mcrypt
+memcache
+memcached
+mongodb
+mongodb1
+msgpack
+newrelic
+oauth
+opentelemetry
+pcov
+pdo_firebird
+pdo_sqlsrv
+pecl_http
+phalcon3
+phalcon4
+phalcon5
+pinba
+propro
+protobuf
+psr
+raphf
+rdkafka
+redis
+scalar_objects
+seaslog
+snmp
+spx
+sqlsrv
+ssh2
+swoole
+swow
+uopz
+uploadprogress
+uuid
+v8js
+vips
+vld
+xdebug
+xdebug2
+xhprof
+xlswriter
+yaml
+zmq
+zstd

package/src/lists/jammy-libs

@@ -247,10 +247,8 @@ libinih1
 libintl-perl
 libintl-xs-perl
 libio-html-perl
-libio-pty-perl
 libip4tc2
 libip6tc2
-libipc-run-perl
 libisc-export1105
 libisl23
 libisns0
@@ -303,6 +301,9 @@ liblqr-1-0-dev
 liblsan0
 libltdl-dev
 libltdl7
+liblttng-ust-common1
+liblttng-ust-ctl5
+liblttng-ust1
 liblua5.3-0
 liblvm2cmd2.03
 liblwp-mediatypes-perl
@@ -514,6 +515,7 @@ libnsl2
 libnspr4
 libnss-systemd
 libnss3
+libnss3-tools
 libntfs-3g89
 libnuma1
 libobjc-11-dev
@@ -643,7 +645,6 @@ libssl3
 libstdc++-10-dev
 libstdc++-11-dev
 libstdc++-12-dev
-libstdc++-9-dev
 libstdc++6
 libstemmer0d
 libsvn1

package/src/lists/noble-libs

@@ -95,7 +95,6 @@ libdbus-1-3
 libdbusmenu-glib4
 libdbusmenu-gtk3-4
 libdconf1
-libde265-0
 libdebconfclient0
 libdeflate0
 libdevmapper-event1.02.1
@@ -189,7 +188,6 @@ libharfbuzz0b
 libhashkit2t64
 libhavege2
 libheif-plugin-aomdec
-libheif-plugin-libde265
 libheif1
 libhogweed6t64
 libhtml-parser-perl
@@ -209,10 +207,8 @@ libinih1
 libintl-perl
 libintl-xs-perl
 libio-html-perl
-libio-pty-perl
 libip4tc2
 libip6tc2
-libipc-run-perl
 libisl23
 libisns0t64
 libitm1
@@ -248,6 +244,7 @@ libllvm16t64
 libllvm17t64
 libllvm18
 libllvm19
+libllvm20
 liblmdb0
 liblocale-gettext-perl
 liblqr-1-0
@@ -306,6 +303,7 @@ libnpth0t64
 libnspr4
 libnss-systemd
 libnss3
+libnss3-tools
 libntfs-3g89t64
 libnuma1
 libnvme1t64
@@ -470,7 +468,6 @@ libvulkan1
 libwayland-client0
 libwayland-cursor0
 libwayland-egl1
-libwayland-server0
 libwbclient0
 libwebp7
 libwebpdemux2

package/src/scripts/cache.sh

@@ -42,6 +42,8 @@ get_api_version() {
   8.1) echo "20210902" ;;
   8.2) echo "20220829" ;;
   8.3) echo "20230831" ;;
+  8.4) echo "20240924" ;;
+  8.5) echo "20250925" ;;
   *) get_api_version_from_repo ;;
   esac
 }
@@ -86,9 +88,20 @@ linux_php_semver() {
   fi
 }
 
+get_cache_scope() {
+  local scope="${GITHUB_REPOSITORY}"
+  if [ "${share_cache_across_workflows:-false}" != "true" ]; then
+    scope="$scope-${GITHUB_WORKFLOW}"
+  fi
+  if [ "$runner" = "github" ] && [ "${share_cache_across_jobs:-false}" != "true" ]; then
+    scope="$scope-${GITHUB_JOB}"
+  fi
+  echo "$scope"
+}
+
 data() {
   old_versions="5.[3-5]"
-  date='20240716'
+  date='20260314'
   arch=$(uname -m)
   if [ "$os" = "Linux" ]; then
     . /etc/os-release
@@ -106,12 +119,17 @@ data() {
   else
     os="Windows-$arch"
     dir='C:\\tools\\php\\ext'
+    [ "$version" = "8.6" ] && date='20260608'
   fi
-  job="${GITHUB_REPOSITORY}-${GITHUB_WORKFLOW}-${GITHUB_JOB}"
+  [[ ( -z "$ImageOS" && -z "$ImageVersion" ) ||
+     ( -n "$RUNNER_ENVIRONMENT" && "$RUNNER_ENVIRONMENT" = "self-hosted" ) ||
+     -n "$ACT" || -n "$CONTAINER" ]] && _runner=self-hosted || _runner=github
+  runner="${runner:-${RUNNER:-$_runner}}"
+  scope="$(get_cache_scope)"
   if command -v "sha256sum" >/dev/null; then
-    key="$(echo -n "$extensions-$key-$job" | sha256sum | cut -d ' ' -f 1)"
+    key="$(echo -n "$extensions-$key-$scope" | sha256sum | cut -d ' ' -f 1)"
   else
-    key="$(echo -n "$extensions-$key-$job" | openssl dgst -sha256 | cut -d ' ' -f 2)"
+    key="$(echo -n "$extensions-$key-$scope" | openssl dgst -sha256 | cut -d ' ' -f 2)"
   fi
   key="$os"-"$version"-"$key"-"$date"
   echo "$dir" > "${RUNNER_TEMP:?}"/dir
@@ -133,9 +151,10 @@ init() {
   export tick="✓"
   export cross="✗"
   script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)
+  platform_script="$script_dir/$(echo "$os" | tr '[:upper:]' '[:lower:]').sh"
   if [[ "$os" = "Linux" || "$os" = "Darwin" ]]; then
     # shellcheck disable=SC1090
-    . "$script_dir/$(echo "$os" | tr '[:upper:]' '[:lower:]').sh"
+    . "$platform_script"
     self_hosted_helper
   fi
 }
@@ -144,6 +163,8 @@ run=$1
 extensions=$2
 version=$3
 key=$4
+share_cache_across_jobs=${5:-false}
+share_cache_across_workflows=${6:-false}
 os="$(uname -s)"
 init
 $run

package/src/scripts/darwin.sh

@@ -21,12 +21,43 @@ add_brew_tap() {
       fi
     fi
   fi
+  brew trust "$tap" >/dev/null 2>&1
+}
+
+get_lookup_extension_name() {
+  extension=$1
+  case "$extension" in
+  http) echo "pecl_http" ;;
+  *) echo "$extension" ;;
+  esac
+}
+
+get_config_extension_name() {
+  extension=$1
+  case "$extension" in
+  http | pecl_http) echo "http" ;;
+  phalcon | phalcon3 | phalcon4 | phalcon5) echo "phalcon" ;;
+  redis | phpredis) echo "redis" ;;
+  xdebug | xdebug2) echo "xdebug" ;;
+  *) echo "$extension" ;;
+  esac
+}
+
+get_formula_name() {
+  extension="$(get_lookup_extension_name "$1")"
+  case "$extension" in
+  redis) echo "phpredis" ;;
+  firebird) echo "interbase" ;;
+  *) echo "$extension" ;;
+  esac
 }
 
 get_dependencies() {
   extension=$1
-  list_deps="$(grep "$extension" "${script_dir:?}"/../lists/darwin-deps | cut -d '=' -f 2)"
-  formula_file="$tap_dir/$ext_tap/Formula/$extension@${version:?}.rb"
+  extension_name="$(get_lookup_extension_name "$extension")"
+  list_deps="$(grep "^$extension_name=" "${script_dir:?}"/../lists/darwin-deps | cut -d '=' -f 2)"
+  formula_name="$(get_formula_name "$extension")"
+  formula_file="$tap_dir/$ext_tap/Formula/$formula_name@${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' ' ')"
@@ -42,8 +73,9 @@ filter_extensions() {
   extensions_array=("$@")
   filtered_extensions=()
   for ext in "${extensions_array[@]}"; do
-    if grep -i -q -w "$ext" "${script_dir:?}"/../lists/darwin-extensions ||
-      grep -q "$ext=" "${script_dir:?}"/../lists/darwin-deps; then
+    extension_name="$(get_lookup_extension_name "$ext")"
+    if grep -i -q -w "$extension_name" "${script_dir:?}"/../lists/darwin-extensions ||
+      grep -q "^$extension_name=" "${script_dir:?}"/../lists/darwin-deps; then
       filtered_extensions+=("$ext")
     fi
   done
@@ -54,7 +86,7 @@ setup_extensions_helper() {
   dependent_extension=$1
   dependency_extension=$2
   extension_dir=$3
-  dependency_extension_name="$(basename "$(echo $dependency_extension | cut -d'@' -f 1)")"
+  dependency_extension_name="$(basename "$(echo "$dependency_extension" | cut -d'@' -f 1)")"
   cached_extension="${deps_cache_directory:?}/$dependency_extension_name.so"
   if ! [ -e "$cached_extension" ]; then
     brew install "$dependency_extension"
@@ -67,12 +99,13 @@ setup_extensions_helper() {
 }
 
 setup_extensions() {
-  dependent_extension=$1
+  requested_extension=$1
+  dependent_extension="$(get_config_extension_name "$requested_extension")"
   extension_dir=$2
   shift 2
   dependency_extensions_array=("$@")
-  sudo mkdir -p "$cache_directory"/"$extension"
-  echo "::group::Logs to set up extensions required for $extension"
+  sudo mkdir -p "$cache_directory"/"$dependent_extension"
+  echo "::group::Logs to set up extensions required for $requested_extension"
   for dependency_extension in "${dependency_extensions_array[@]}"; do
     setup_extensions_helper "$dependent_extension" "$dependency_extension" "$extension_dir"
   done
@@ -161,7 +194,7 @@ setup_dependencies() {
   extension_dir=$2
   cache_directory=/tmp/extcache
   [[ -z "${extensions// /}" ]] && return
-  IFS=' ' read -r -a extensions_array <<<"$(echo "$extensions" | sed -e "s/pdo[_-]//g" -Ee "s/^|,\s*/ /g")"
+  IFS=' ' read -r -a extensions_array <<<"$(echo "$extensions" | sed -Ee "s/^|,\s*/ /g")"
   IFS=' ' read -r -a extensions_array <<<"$(filter_extensions "${extensions_array[@]}")"
   if [[ -n "${extensions_array[*]// /}" ]]; then
     add_brew_tap "$php_tap"

package/src/scripts/linux.sh

@@ -23,9 +23,8 @@ add_package() {
 
 add_ppa_package() {
   package=$1
-  package_link="$(get_package_link "$package")"
-  curl -o /tmp/"$package.deb" -sL "$package_link"
-  sudo DEBIAN_FRONTEND=noninteractive dpkg -i "/tmp/$package.deb"
+  download_ppa_package "$package" "/tmp/$package.deb" &&
+    sudo DEBIAN_FRONTEND=noninteractive dpkg -i "/tmp/$package.deb"
 }
 
 link_apt_fast() {
@@ -35,11 +34,34 @@ link_apt_fast() {
   fi
 }
 
+download_ppa_file() {
+  local file=$1
+  local target=$2
+  local root
+  local roots=()
+  if [[ -n "${preferred_ppa_root:-}" ]]; then
+    roots+=("$preferred_ppa_root")
+  fi
+  for root in "https://ppa.launchpadcontent.net" "https://ppa.setup-php.com"; do
+    [[ "$root" = "${preferred_ppa_root:-}" ]] && continue
+    roots+=("$root")
+  done
+  rm -f "$target"
+  for root in "${roots[@]}"; do
+    if curl -H "User-Agent: Debian APT-HTTP/GHA(ce)" --connect-timeout 5 -o "$target" -fsL "$root/$file"; then
+      preferred_ppa_root=$root
+      return 0
+    fi
+    rm -f "$target"
+  done
+  return 1
+}
+
 fetch_package() {
   if ! [ -e /tmp/Packages ]; then
     . /etc/os-release
     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"
+    download_ppa_file "ondrej/php/ubuntu/dists/$VERSION_CODENAME/main/binary-$arch/Packages.gz" "/tmp/Packages.gz" || return 1
     gzip -df /tmp/Packages.gz
   fi
 }
@@ -55,11 +77,20 @@ get_dependencies() {
   echo "${deps[@]}"
 }
 
-get_package_link() {
+get_package_file() {
+  package=$1
+  awk -v package="$package" '
+    $1 == "Package:" && $2 == package { found = 1 }
+    found && $1 == "Filename:" { print $2; exit }
+    found && /^$/ { found = 0 }
+  ' /tmp/Packages | tr -d '\r'
+}
+
+download_ppa_package() {
   package=$1
-  trunk="http://ppa.launchpad.net/ondrej/php/ubuntu"
-  file=$(sed -e '/Package:\s'"$package$"'/,/^\s*$/!d' /tmp/Packages | grep -Eo "^Filename.*" | cut -d' ' -f 2 | tr -d '\r')
-  echo "$trunk/$file"
+  target=$2
+  file=$(get_package_file "$package")
+  download_ppa_file "ondrej/php/ubuntu/$file" "$target"
 }
 
 setup_extensions_helper() {
@@ -68,8 +99,7 @@ setup_extensions_helper() {
   cached_extension="${deps_cache_directory:?}/$dependency_extension.so"
   if ! [ -e "$extension_dir/$dependency_extension.so" ]; then
     if ! [ -e "$cached_extension" ]; then
-      extension_package_link="$(get_package_link "php${version:?}-$dependency_extension")"
-      sudo curl -H "User-Agent: Debian APT-HTTP/GHA(ce)" -o "/tmp/$dependency_extension".deb -sL "$extension_package_link"
+      download_ppa_package "php${version:?}-$dependency_extension" "/tmp/$dependency_extension".deb || return 1
       sudo dpkg-deb -x "/tmp/$dependency_extension".deb /
       sudo cp "$extension_dir/$dependency_extension.so" "$cached_extension"
       fix_ownership "$extension_dir"
@@ -139,7 +169,7 @@ setup_dependencies() {
   extension_packages=""
   for extension_package in "${extensions_array[@]}"; do
     [[ ! "$extension_package" =~ php[0-9]+\.[0-9]+-[a-zA-Z0-9]+$ ]] && continue
-    fetch_package
+    fetch_package || return 1
     libraries="$libraries $(get_dependencies "$extension_package" "lib")"
     IFS=' ' read -r -a dependency_extension_packages_array <<<"$(get_dependencies "$extension_package" "php$version-")"
     extension_packages="$extension_packages ${dependency_extension_packages_array[*]}"

package/src/utils.ts

@@ -1,15 +1,19 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as spu from 'setup-php/lib/utils';
+import {readFile} from 'node:fs/promises';
+import {join} from 'node:path';
+import * as spu from 'setup-php/lib/utils.js';
+
+export const SCRIPT_PATH = join(import.meta.dirname, '../src/scripts/cache.sh');
+
+export type ScriptCall = {
+  command: 'bash';
+  args: [string, string, ...string[]];
+};
 
 /**
  * Function to get outputs
  */
 export async function getOutput(output: string): Promise<string> {
-  return fs.readFileSync(
-    path.join(await spu.readEnv('RUNNER_TEMP'), output),
-    'utf8'
-  );
+  return readFile(join(await spu.readEnv('RUNNER_TEMP'), output), 'utf8');
 }
 
 /**
@@ -17,15 +21,13 @@ export async function getOutput(output: string): Promise<string> {
  *
  * @param extension_csv
  */
-export async function filterExtensions(extension_csv: string): Promise<string> {
-  return JSON.stringify(
-    extension_csv
-      .split(',')
-      .filter(extension => {
-        return extension.trim()[0] != ':';
-      })
-      .join(',')
-  );
+export function filterExtensions(extension_csv: string): string {
+  return extension_csv
+    .split(',')
+    .filter(extension => {
+      return extension.trim()[0] != ':';
+    })
+    .join(',');
 }
 
 /**
@@ -34,10 +36,9 @@ export async function filterExtensions(extension_csv: string): Promise<string> {
  * @param fn
  * @param args
  */
-export async function scriptCall(
-  fn: string,
-  ...args: string[]
-): Promise<string> {
-  const script: string = path.join(__dirname, '../src/scripts/cache.sh');
-  return ['bash', script, fn, ...args].join(' ');
+export function scriptCall(fn: string, ...args: string[]): ScriptCall {
+  return {
+    command: 'bash',
+    args: [SCRIPT_PATH, fn, ...args]
+  };
 }