Improve code based on PR comments

software-mansion · Jul 27, 2023 · 5739c26 · 5739c26
1 parent 153d98e
commit 5739c26
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/versions.js b/lib/versions.js
@@ -1,17 +1,17 @@
-import fs from "fs";
+import fs from "fs/promises";
 import * as core from "@actions/core";
 import { HttpClient } from "@actions/http-client";
 
 export async function determineVersion(repo, versionInput) {
   versionInput = versionInput?.trim();
 
-  if (versionInput === "latest") {
-    versionInput = await fetchLatestTag(repo);
-  }
-
   if (!versionInput) {
     let toolVersion = getVersionFromToolVersionsFile();
-    versionInput = toolVersion ?? (await fetchLatestTag(repo));
+    versionInput = toolVersion ?? "latest";
+  }
+
+  if (versionInput === "latest") {
+    versionInput = await fetchLatestTag(repo);
   }
 
   return versionInput.startsWith("v")
@@ -61,14 +61,12 @@ function fetchLatestTag(repo) {
   );
 }
 
-function getVersionFromToolVersionsFile() {
-  const fileName = ".tool-versions";
-  if (!fs.existsSync(fileName)) return;
-
-  const toolVersions = fs.readFileSync(fileName, "utf-8").split("\n");
-  const scarbVersionInfo = toolVersions.find((tool) => tool.match(/^scarb/));
-  if (!scarbVersionInfo) return;
-
-  const [, version] = scarbVersionInfo.match(/scarb ([\w.-]+)/);
-  return version;
+async function getVersionFromToolVersionsFile() {
+  try {
+    return (await fs.readFile(".tool-versions", "utf-8")).match(
+      /^scarb ([\w.-]+)/m,
+    )?.[1];
+  } catch (e) {
+    return;
+  }
 }