Merge 6ecdea2b64 into 7f17e836c0

dist/setup/index.js

@@ -93609,6 +93609,10 @@ function parseGoVersionFile(versionFilePath) {
         const match = contents.match(/^go (\d+(\.\d+)*)/m);
         return match ? match[1] : '';
     }
+    else if (path.basename(versionFilePath) === '.tool-versions') {
+        const match = contents.match(/^golang\s+(\d+(\.\d+)*)/m);
+        return match ? match[1] : '';
+    }
     return contents.trim();
 }
 exports.parseGoVersionFile = parseGoVersionFile;

src/installer.ts

@@ -462,6 +462,9 @@ export function parseGoVersionFile(versionFilePath: string): string {
   ) {
     const match = contents.match(/^go (\d+(\.\d+)*)/m);
     return match ? match[1] : '';
+  } else if (path.basename(versionFilePath) === '.tool-versions') {
+    const match = contents.match(/^golang\s+(\d+(\.\d+)*)/m);
+    return match ? match[1] : '';
   }
 
   return contents.trim();