1.2.2

.github/workflows/test.yml

@@ -11,14 +11,14 @@ jobs:
 
     strategy:
       matrix:
-        os: [macOS-latest, macos-14, macos-13]
+        os: [ubuntu-latest, windows-latest, windows-11-arm, macOS-latest]
-        version: [branch@test]
+        version: [latest, branch@master, branch@dev]
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v1
-      - uses: xmake-io/github-action-setup-xmake@test
+      - uses: xmake-io/github-action-setup-xmake@master
         with:
           xmake-version: ${{ matrix.version }}
           actions-cache-folder: '.xmake-cache'
@@ -31,7 +31,6 @@ jobs:
 
       - name: Run tests
         run: |
-          sw_vers -productVersion
           xmake --version
           cd tests/sample
           xmake -y -vD

dist/index.js

@@ -70512,9 +70512,9 @@ const core = __nccwpck_require__(7484);
 const exec_1 = __nccwpck_require__(5236);
 const io = __nccwpck_require__(4994);
 const cache = __nccwpck_require__(5116);
-const os = __nccwpck_require__(857);
 const path = __nccwpck_require__(6928);
 const fsutils = __nccwpck_require__(7999);
+const system_1 = __nccwpck_require__(7666);
 function getBuildTime(hours) {
     let key = 'BuildTime';
     if (hours && hours !== '') {
@@ -70545,8 +70545,7 @@ function getProjectRootPath() {
     }
     return projectRootPath;
 }
-function getBuildCacheKey(buildCacheTime) {
+async function getBuildCacheKey(buildCacheTime) {
-    var _a;
     let buildCacheKey = core.getInput('build-cache-key');
     if (!buildCacheKey) {
         buildCacheKey = '';
@@ -70554,7 +70553,8 @@ function getBuildCacheKey(buildCacheTime) {
     if (!buildCacheTime || buildCacheTime === '') {
         buildCacheTime = getBuildTime();
     }
-    return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
+    const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
+    return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${platformIdentifier}`;
 }
 async function getBuildCachePath() {
     let buildCachePath = core.getInput('build-cache-path');
@@ -70611,7 +70611,7 @@ async function loadBuildCache() {
             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);
@@ -70644,7 +70644,7 @@ async function saveBuildCache() {
         return;
     }
     const buildCacheFolder = getBuildCacheFolder();
-    const buildCacheKey = getBuildCacheKey();
+    const buildCacheKey = await getBuildCacheKey();
     const buildCachePath = await getBuildCachePath();
     const hitBuildCache = !!core.getState('hitBuildCache');
     if (!hitBuildCache && buildCacheFolder && process.env.GITHUB_WORKSPACE && fsutils.isDir(buildCachePath)) {
@@ -70832,9 +70832,9 @@ const core = __nccwpck_require__(7484);
 const exec_1 = __nccwpck_require__(5236);
 const io = __nccwpck_require__(4994);
 const cache = __nccwpck_require__(5116);
-const os = __nccwpck_require__(857);
 const path = __nccwpck_require__(6928);
 const fsutils = __nccwpck_require__(7999);
+const system_1 = __nccwpck_require__(7666);
 function getProjectRootPath() {
     let projectRootPath = core.getInput('project-path');
     if (!projectRootPath) {
@@ -70847,7 +70847,6 @@ function getProjectRootPath() {
     return projectRootPath;
 }
 async function getPackageCacheKey() {
-    var _a;
     let packageCacheKey = core.getInput('package-cache-key');
     if (!packageCacheKey) {
         packageCacheKey = '';
@@ -70870,7 +70869,8 @@ async function getPackageCacheKey() {
         await (0, exec_1.exec)('xmake', ['l', 'utils.ci.packageskey'], options);
         packageCacheHash = packageCacheHash.trim();
     }
-    return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
+    const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
+    return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${platformIdentifier}`;
 }
 async function getPackageCachePath() {
     let packageCachePath = '';
@@ -70976,23 +70976,16 @@ if (!exports.IsPost) {
 
 /***/ }),
 
-/***/ 9095:
+/***/ 7666:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.unixInstall = unixInstall;
+exports.getPlatformIdentifier = getPlatformIdentifier;
 const core = __nccwpck_require__(7484);
 const exec_1 = __nccwpck_require__(5236);
-const io = __nccwpck_require__(4994);
-const toolCache = __nccwpck_require__(3472);
-const cache = __nccwpck_require__(5116);
 const os = __nccwpck_require__(857);
-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'}`;
@@ -71017,10 +71010,32 @@ async function getPlatformIdentifier() {
     }
     return identifier;
 }
+
+
+/***/ }),
+
+/***/ 9095:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.unixInstall = unixInstall;
+const core = __nccwpck_require__(7484);
+const exec_1 = __nccwpck_require__(5236);
+const io = __nccwpck_require__(4994);
+const toolCache = __nccwpck_require__(3472);
+const cache = __nccwpck_require__(5116);
+const os = __nccwpck_require__(857);
+const fs = __nccwpck_require__(9896);
+const path = __nccwpck_require__(6928);
+const semver = __nccwpck_require__(2088);
+const git = __nccwpck_require__(1243);
+const system_1 = __nccwpck_require__(7666);
 async function install(sourceDir, binDir) {
     if (fs.existsSync(path.join(sourceDir, 'configure'))) {
         await (0, exec_1.exec)('sh', ['./configure'], { cwd: sourceDir });
-        await (0, exec_1.exec)('make', ['-j6', 'VERBOSE=1'], { cwd: sourceDir });
+        await (0, exec_1.exec)('make', ['-j6'], { cwd: sourceDir });
         await (0, exec_1.exec)('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
     }
     else {
@@ -71038,7 +71053,7 @@ async function unixInstall(version) {
     if (version.type !== 'local') {
         const ver = version.version;
         const sha = version.sha;
-        const platformIdentifier = await getPlatformIdentifier();
+        const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
         const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
         if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
             const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
@@ -71098,8 +71113,6 @@ async function unixInstall(version) {
     else {
         core.addPath(path.join(toolDir, 'share', 'xmake')); // only for <= 2.3.1
     }
-    // xmake l utils.binary.deplibs /Users/ruki/.local/bin/xmake
-    await (0, exec_1.exec)(`xmake l --root utils.binary.deplibs ${path.join(toolDir, 'bin', 'xmake')}`);
 }
 
 
@@ -71289,6 +71302,7 @@ const fs = __nccwpck_require__(9896);
 const path = __nccwpck_require__(6928);
 const semver = __nccwpck_require__(2088);
 const git = __nccwpck_require__(1243);
+const system_1 = __nccwpck_require__(7666);
 function getInstallerUrl(version, latest) {
     let ver = version.version;
     switch (version.type) {
@@ -71324,7 +71338,6 @@ async function installFromSource(xmakeBin, sourceDir, binDir) {
     await (0, exec_1.exec)(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
 }
 async function winInstall(version, latest) {
-    var _a;
     if (version.type === 'local' || latest.type === 'local') {
         throw new Error('Local builds for windows is not supported');
     }
@@ -71335,7 +71348,8 @@ async function winInstall(version, latest) {
     }
     const ver = version.version;
     const sha = version.sha;
-    const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
+    const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
+    const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
     let toolDir = '';
     if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
         const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
@@ -71343,14 +71357,14 @@ async function winInstall(version, latest) {
             try {
                 fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
             }
-            catch (_b) {
+            catch (_a) {
                 await cache.restoreCache([actionsCacheFolder], cacheKey);
             }
             fs.accessSync(path.join(fullCachePath, 'xmake.exe'), 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);
         }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "github-action-setup-xmake",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "github-action-setup-xmake",
-      "version": "1.2.1",
+      "version": "1.2.2",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@actions/cache": "^4.0.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-action-setup-xmake",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Set up your GitHub Actions workflow with a specific version of xmake",
   "main": "dist/index.js",
   "author": "OpportunityLiu",

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,36 +9,12 @@ import * as path from 'path';
 import * as semver from 'semver';
 import * as git from './git';
 import { Version } from './interfaces';
-
+import { getPlatformIdentifier } from './system';
-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 });
-        await exec('make', ['-j6', 'VERBOSE=1'], { cwd: sourceDir });
+        await exec('make', ['-j6'], { cwd: sourceDir });
         await exec('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
     } else {
         await exec('make', ['-j6'], { cwd: sourceDir });
@@ -116,7 +92,4 @@ export async function unixInstall(version: Version): Promise<void> {
     } else {
         core.addPath(path.join(toolDir, 'share', 'xmake')); // only for <= 2.3.1
     }
-
-    // xmake l utils.binary.deplibs /Users/ruki/.local/bin/xmake
-    await exec(`xmake l --root utils.binary.deplibs ${path.join(toolDir, 'bin', 'xmake')}`);
 }

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()}-${
+    const platformIdentifier = await getPlatformIdentifier();
-        process.env.RUNNER_OS ?? 'unknown'
+    const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
-    }`;
 
     let toolDir = '';
     if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {