Merge 6ecdea2b649cf54f04d23e9235d7a28e626bb247 into e75c3e80bcde46e322cd5845ae46582947c9becd

This commit is contained in:
Sergey Dolin 2025-08-13 10:10:10 -07:00 committed by GitHub
commit facb605f09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions

4
dist/setup/index.js vendored
View File

@ -94666,6 +94666,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();
}
function resolveStableVersionDist(versionSpec, arch) {

View File

@ -497,6 +497,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();