v1.1.1

Bump json5 from 2.2.0 to 2.2.3

dist/index.js

@@ -70865,8 +70865,15 @@ const path = __nccwpck_require__(1017);
 const semver = __nccwpck_require__(1383);
 const git = __nccwpck_require__(6350);
 async function install(sourceDir, binDir) {
-    await exec_1.exec('make', ['build'], { cwd: sourceDir });
-    await exec_1.exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
+    if (fs.existsSync(path.join(sourceDir, 'configure'))) {
+        await exec_1.exec('sh', ['./configure'], { cwd: sourceDir });
+        await exec_1.exec('make', ['-j6'], { cwd: sourceDir });
+        await exec_1.exec('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
+    }
+    else {
+        await exec_1.exec('make', ['-j6'], { cwd: sourceDir });
+        await exec_1.exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
+    }
 }
 async function unixInstall(version) {
     var _a;
@@ -71435,7 +71442,7 @@ async function run() {
         else {
             await unix_install_1.unixInstall(version);
         }
-        await exec_1.exec('xmake --version');
+        await exec_1.exec('xmake --root --version');
     }
     catch (error) {
         const ex = error;

package.json

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

src/index.ts

@@ -14,7 +14,7 @@ async function run(): Promise<void> {
         } else {
             await unixInstall(version);
         }
-        await exec('xmake --version');
+        await exec('xmake --root --version');
     } catch (error) {
         const ex = error as Error;
         core.setFailed(ex.message);

src/unix-install.ts

@@ -11,8 +11,14 @@ import * as git from './git';
 import { Version } from './interfaces';
 
 async function install(sourceDir: string, binDir: string): Promise<void> {
-    await exec('make', ['build'], { cwd: sourceDir });
-    await exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
+    if (fs.existsSync(path.join(sourceDir, 'configure'))) {
+        await exec('sh', ['./configure'], { cwd: sourceDir });
+        await exec('make', ['-j6'], { cwd: sourceDir });
+        await exec('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
+    } else {
+        await exec('make', ['-j6'], { cwd: sourceDir });
+        await exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
+    }
 }
 
 export async function unixInstall(version: Version): Promise<void> {

yarn.lock

@@ -2561,11 +2561,9 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json5@2.x, json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=
-  dependencies:
-    minimist "^1.2.5"
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 kleur@^3.0.3:
   version "3.0.3"
@@ -2688,11 +2686,6 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
 mkdirp@1.x:
   version "1.0.4"
   resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"