inline installer.parseGoVersionFile()

myaaaaaaaaa · Jul 7, 2024 · 9482282 · 9482282
1 parent facc04d
commit 9482282
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/src/installer.ts b/src/installer.ts
@@ -417,20 +417,6 @@ export function makeSemver(version: string): string {
   return fullVersion;
 }
 
-export function parseGoVersionFile(versionFilePath: string): string {
-  const contents = fs.readFileSync(versionFilePath).toString();
-
-  if (
-    path.basename(versionFilePath) === 'go.mod' ||
-    path.basename(versionFilePath) === 'go.work'
-  ) {
-    const match = contents.match(/^go (\d+(\.\d+)*)/m);
-    return match ? match[1] : '';
-  }
-
-  return contents.trim();
-}
-
 async function resolveStableVersionDist(versionSpec: string, arch: string) {
   const archFilter = sys.getArch(arch);
   const platFilter = sys.getPlatform();

diff --git a/src/main.ts b/src/main.ts
@@ -143,22 +143,24 @@ function resolveVersionInput(): string {
     core.warning(
       'Both go-version and go-version-file inputs are specified, only go-version will be used'
     );
+    versionFilePath = '';
   }
-
-  if (version) {
-    if (!version.endsWith('go.mod')) {
-      return version;
-    }
-    versionFilePath = version;
+  if (versionFilePath) {
+    version = versionFilePath;
   }
 
-  if (versionFilePath) {
-    if (!fs.existsSync(versionFilePath)) {
+  if (
+    path.basename(version) === 'go.mod' ||
+    path.basename(version) === 'go.work'
+  ) {
+    if (!fs.existsSync(version)) {
       throw new Error(
-        `The specified go version file at: ${versionFilePath} does not exist`
+        `The specified go version file at: ${version} does not exist`
       );
     }
-    version = installer.parseGoVersionFile(versionFilePath);
+    const contents = fs.readFileSync(version).toString();
+    const match = contents.match(/^go (\d+(\.\d+)*)/m);
+    return match ? match[1] : '';
   }
 
   return version;