setup-ovr-platform-util@v1.0.3 (#4)

- added `self-update` option
- refactoring and optimization

README.md

@@ -19,3 +19,9 @@ jobs:
         # run commands
       - run: 'ovr-platform-util version'
 ```
+
+### inputs
+
+| Name | Description | Required |
+| ---- | ----------- | -------- |
+| `self-update` | Automatically update the ovr-platform-util tool. | Defaults to `true`. |

action.yml

@@ -3,6 +3,11 @@ description: 'A GitHub Action to setup the ovr-platform-util tool command alias.
 branding:
   icon: 'terminal'
   color: 'red'
+inputs:
+  self-update:
+    description: 'Automatically perform self update of ovr-platform-util tool.'
+    required: false
+    default: 'true'
 runs:
   using: 'node20'
   main: 'dist/index.js'

dist/index.js

@@ -33273,25 +33273,32 @@ async function setup_ovrPlatformUtil() {
         const downloadVersion = await getVersion(archivePath);
         core.debug(`Setting tool cache: ${archivePath} | ${toolPath} | ${ovrPlatformUtil} | ${downloadVersion}`);
         toolDirectory = await tc.cacheFile(archivePath, toolPath, ovrPlatformUtil, downloadVersion);
-        tool = getExecutable(toolDirectory);
+        tool = await getExecutable(toolDirectory);
     }
     else {
-        tool = getExecutable(toolDirectory);
-        fs.promises.access(tool);
-        core.debug(`Found ${tool} in ${toolDirectory}`);
-        await exec.exec(tool, ['self-update']);
-        await new Promise(resolve => setTimeout(resolve, 1000));
+        tool = await getExecutable(toolDirectory);
+        const selfUpdate = (core.getInput('self-update') || 'true') === 'true';
+        if (selfUpdate) {
+            await exec.exec(tool, ['self-update']);
+            await checkToolAccess(tool);
+        }
     }
     core.debug(`${ovrPlatformUtil} -> ${toolDirectory}`);
     core.addPath(toolDirectory);
+    await exec.exec(ovrPlatformUtil, ['help']);
+}
+async function checkToolAccess(tool, retries = 5) {
+    await new Promise(resolve => setTimeout(resolve, 1000));
     try {
-        await exec.exec(ovrPlatformUtil, ['help']);
+        await fs.promises.access(tool, fs.constants.X_OK);
     }
     catch (error) {
         if (error.code === 'EBUSY') {
-            core.warning(`Waiting for ${tool} to be released...`);
-            await new Promise(resolve => setTimeout(resolve, 1000));
-            await exec.exec(ovrPlatformUtil, ['help']);
+            core.warning(`Failed to access ${tool}, retrying...`);
+            await checkToolAccess(tool, retries - 1);
+        }
+        else {
+            throw error;
         }
     }
 }
@@ -33310,8 +33317,11 @@ function getTempDirectory() {
     const tempDirectory = process.env['RUNNER_TEMP'] || '';
     return tempDirectory;
 }
-function getExecutable(directory) {
-    return path.join(directory, toolPath);
+async function getExecutable(directory) {
+    const tool = path.join(directory, toolPath);
+    await fs.promises.access(tool, fs.constants.X_OK);
+    core.debug(`Found ${tool} in ${directory}`);
+    return tool;
 }
 async function getVersion(tool) {
     const semVerRegEx = new RegExp(/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)?/);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-ovr-platform-util",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A GitHub Action to setup the ovr-platform-util tool command alias.",
   "author": "buildalon",
   "repository": {

src/index.ts

@@ -37,23 +37,30 @@ async function setup_ovrPlatformUtil(): Promise<void> {
         const downloadVersion = await getVersion(archivePath);
         core.debug(`Setting tool cache: ${archivePath} | ${toolPath} | ${ovrPlatformUtil} | ${downloadVersion}`);
         toolDirectory = await tc.cacheFile(archivePath, toolPath, ovrPlatformUtil, downloadVersion);
-        tool = getExecutable(toolDirectory);
+        tool = await getExecutable(toolDirectory);
     } else {
-        tool = getExecutable(toolDirectory);
-        fs.promises.access(tool);
-        core.debug(`Found ${tool} in ${toolDirectory}`);
-        await exec.exec(tool, ['self-update']);
-        await new Promise(resolve => setTimeout(resolve, 1000));
+        tool = await getExecutable(toolDirectory);
+        const selfUpdate = (core.getInput('self-update') || 'true') === 'true';
+        if (selfUpdate) {
+            await exec.exec(tool, ['self-update']);
+            await checkToolAccess(tool);
+        }
     }
     core.debug(`${ovrPlatformUtil} -> ${toolDirectory}`)
     core.addPath(toolDirectory);
+    await exec.exec(ovrPlatformUtil, ['help']);
+}
+
+async function checkToolAccess(tool: string, retries = 5): Promise<void> {
+    await new Promise(resolve => setTimeout(resolve, 1000));
     try {
-        await exec.exec(ovrPlatformUtil, ['help']);
+        await fs.promises.access(tool, fs.constants.X_OK);
     } catch (error) {
         if (error.code === 'EBUSY') {
-            core.warning(`Waiting for ${tool} to be released...`);
-            await new Promise(resolve => setTimeout(resolve, 1000));
-            await exec.exec(ovrPlatformUtil, ['help']);
+            core.warning(`Failed to access ${tool}, retrying...`);
+            await checkToolAccess(tool, retries - 1);
+        } else {
+            throw error;
         }
     }
 }
@@ -73,8 +80,11 @@ function getTempDirectory(): string {
     return tempDirectory
 }
 
-function getExecutable(directory: string): string {
-    return path.join(directory, toolPath);
+async function getExecutable(directory: string): Promise<string> {
+    const tool = path.join(directory, toolPath);
+    await fs.promises.access(tool, fs.constants.X_OK);
+    core.debug(`Found ${tool} in ${directory}`);
+    return tool;
 }
 
 async function getVersion(tool: string): Promise<string> {