improve cache key

src/build-cache.ts

@@ -2,9 +2,9 @@ import * as core from '@actions/core';
 import { exec, ExecOptions } from '@actions/exec';
 import * as io from '@actions/io';
 import * as cache from '@actions/cache';
-import * as os from 'os';
 import * as path from 'path';
 import * as fsutils from './fsutils';
+import { getPlatformIdentifier } from './system';
 
 function getBuildTime(hours?: string): string {
     let key = 'BuildTime';
@@ -38,7 +38,7 @@ function getProjectRootPath(): string {
     return projectRootPath;
 }
 
-function getBuildCacheKey(buildCacheTime?: string): string {
+async function getBuildCacheKey(buildCacheTime?: string): Promise<string> {
     let buildCacheKey = core.getInput('build-cache-key');
     if (!buildCacheKey) {
         buildCacheKey = '';
@@ -46,7 +46,8 @@ function getBuildCacheKey(buildCacheTime?: string): string {
     if (!buildCacheTime || buildCacheTime === '') {
         buildCacheTime = getBuildTime();
     }
-    return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
+    const platformIdentifier = await getPlatformIdentifier();
+    return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${platformIdentifier}`;
 }
 
 async function getBuildCachePath(): Promise<string> {
@@ -112,7 +113,7 @@ export async function loadBuildCache(): Promise<void> {
             if (hours < 0) {
                 break;
             }
-            const buildCacheKey = getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
+            const buildCacheKey = await getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
             if (!fsutils.isFile(filepath)) {
                 core.info(`Restore build cache path: ${fullCachePath} to ${buildCachePath}, key: ${buildCacheKey}`);
                 await cache.restoreCache([buildCacheFolder], buildCacheKey);
@@ -147,7 +148,7 @@ export async function saveBuildCache(): Promise<void> {
     }
 
     const buildCacheFolder = getBuildCacheFolder();
-    const buildCacheKey = getBuildCacheKey();
+    const buildCacheKey = await getBuildCacheKey();
     const buildCachePath = await getBuildCachePath();
 
     const hitBuildCache = !!core.getState('hitBuildCache');

src/package-cache.ts

@@ -2,9 +2,9 @@ import * as core from '@actions/core';
 import { exec, ExecOptions } from '@actions/exec';
 import * as io from '@actions/io';
 import * as cache from '@actions/cache';
-import * as os from 'os';
 import * as path from 'path';
 import * as fsutils from './fsutils';
+import { getPlatformIdentifier } from './system';
 
 function getProjectRootPath(): string {
     let projectRootPath = core.getInput('project-path');
@@ -41,7 +41,8 @@ async function getPackageCacheKey(): Promise<string> {
         await exec('xmake', ['l', 'utils.ci.packageskey'], options);
         packageCacheHash = packageCacheHash.trim();
     }
-    return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
+    const platformIdentifier = await getPlatformIdentifier();
+    return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${platformIdentifier}`;
 }
 
 async function getPackageCachePath(): Promise<string> {

src/system.ts

@@ -0,0 +1,28 @@
+import * as core from '@actions/core';
+import { exec } from '@actions/exec';
+import * as os from 'os';
+
+export 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;
+}

src/unix-install.ts

@@ -9,31 +9,7 @@ import * as path from 'path';
 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;
-}
+import { getPlatformIdentifier } from './system';
 
 async function install(sourceDir: string, binDir: string): Promise<void> {
     if (fs.existsSync(path.join(sourceDir, 'configure'))) {

src/win-install.ts

@@ -9,6 +9,7 @@ import * as path from 'path';
 import * as semver from 'semver';
 import * as git from './git';
 import { Version, GitVersion } from './interfaces';
+import { getPlatformIdentifier } from './system';
 
 function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
     let ver = version.version;
@@ -59,9 +60,8 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
 
     const ver = version.version;
     const sha = version.sha;
-    const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${
-        process.env.RUNNER_OS ?? 'unknown'
-    }`;
+    const platformIdentifier = await getPlatformIdentifier();
+    const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
 
     let toolDir = '';
     if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {