From 25369e4c59e98de256bc3a7522eceb0e8def8771 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Thu, 21 Aug 2025 22:59:47 +0800
Subject: [PATCH] ...

---
 dist/index.js       | 32 ++++++++++++++++++++++++++++----
 src/unix-install.ts | 30 +++++++++++++++++++++++++++---
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 11c2bb9..a6448aa 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -70993,6 +70993,30 @@ const fs = __nccwpck_require__(9896);
 const path = __nccwpck_require__(6928);
 const semver = __nccwpck_require__(2088);
 const git = __nccwpck_require__(1243);
+async function getPlatformIdentifier() {
+    var _a;
+    let identifier = `${os.platform()}-${os.arch()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
+    if (os.platform() === 'darwin') {
+        let productVersion = '';
+        try {
+            await (0, exec_1.exec)('sw_vers', ['-productVersion'], {
+                silent: true,
+                listeners: {
+                    stdout: (data) => {
+                        productVersion = data.toString().trim();
+                    },
+                },
+            });
+            if (productVersion) {
+                identifier += `-${productVersion}`;
+            }
+        }
+        catch (error) {
+            core.warning(`Failed to get macOS product version: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    return identifier;
+}
 async function install(sourceDir, binDir) {
     if (fs.existsSync(path.join(sourceDir, 'configure'))) {
         await (0, exec_1.exec)('sh', ['./configure'], { cwd: sourceDir });
@@ -71005,7 +71029,6 @@ async function install(sourceDir, binDir) {
     }
 }
 async function unixInstall(version) {
-    var _a;
     let toolDir = '';
     const actionsCacheFolder = core.getInput('actions-cache-folder');
     let actionsCacheKey = core.getInput('actions-cache-key');
@@ -71015,21 +71038,22 @@ async function unixInstall(version) {
     if (version.type !== 'local') {
         const ver = version.version;
         const sha = version.sha;
-        const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${os.release()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
+        const platformIdentifier = await getPlatformIdentifier();
+        const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
         if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
             const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
             try {
                 try {
                     fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
                 }
-                catch (_b) {
+                catch (_a) {
                     await cache.restoreCache([actionsCacheFolder], cacheKey);
                 }
                 fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
                 toolDir = fullCachePath;
                 core.info(`cache path: ${toolDir}, key: ${cacheKey}`);
             }
-            catch (_c) {
+            catch (_b) {
                 core.warning(`No cached files found at path "${fullCachePath}".`);
                 await io.rmRF(fullCachePath);
             }
diff --git a/src/unix-install.ts b/src/unix-install.ts
index f6f64f2..87100be 100644
--- a/src/unix-install.ts
+++ b/src/unix-install.ts
@@ -10,6 +10,31 @@ import * as semver from 'semver';
 import * as git from './git';
 import { Version } from './interfaces';
 
+async function getPlatformIdentifier(): Promise<string> {
+    let identifier = `${os.platform()}-${os.arch()}-${process.env.RUNNER_OS ?? 'unknown'}`;
+    if (os.platform() === 'darwin') {
+        let productVersion = '';
+        try {
+            await exec('sw_vers', ['-productVersion'], {
+                silent: true,
+                listeners: {
+                    stdout: (data: Buffer) => {
+                        productVersion = data.toString().trim();
+                    },
+                },
+            });
+            if (productVersion) {
+                identifier += `-${productVersion}`;
+            }
+        } catch (error: unknown) {
+            core.warning(
+                `Failed to get macOS product version: ${error instanceof Error ? error.message : String(error)}`,
+            );
+        }
+    }
+    return identifier;
+}
+
 async function install(sourceDir: string, binDir: string): Promise<void> {
     if (fs.existsSync(path.join(sourceDir, 'configure'))) {
         await exec('sh', ['./configure'], { cwd: sourceDir });
@@ -32,9 +57,8 @@ export async function unixInstall(version: Version): Promise<void> {
     if (version.type !== 'local') {
         const ver = version.version;
         const sha = version.sha;
-        const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${os.release()}-${
-            process.env.RUNNER_OS ?? 'unknown'
-        }`;
+        const platformIdentifier = await getPlatformIdentifier();
+        const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
 
         if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
             const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);