actions/setup-go
actions/setup-go
1
0
Fork 0
mirror of https://github.com/actions/setup-go.git synced 2024-06-19 05:55:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6ecdea2b64 into 4ab57d7ea2

Browse source
This commit is contained in:
Sergey Dolin 2024-05-10 09:49:11 -07:00 committed by GitHub
parent 4ab57d7ea2 6ecdea2b64
commit edf1e85011
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/setup/index.js vendored
View file

@ -88332,6 +88332,10 @@ function parseGoVersionFile(versionFilePath) {
const match = contents.match(/^go (\d+(\.\d+)*)/m); const match = contents.match(/^go (\d+(\.\d+)*)/m);
return match ? match[1] : ''; 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(); return contents.trim();
} }
exports.parseGoVersionFile = parseGoVersionFile; exports.parseGoVersionFile = parseGoVersionFile;

3
src/installer.ts
View file

@ -426,6 +426,9 @@ export function parseGoVersionFile(versionFilePath: string): string {
) { ) {
const match = contents.match(/^go (\d+(\.\d+)*)/m); const match = contents.match(/^go (\d+(\.\d+)*)/m);
return match ? match[1] : ''; 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(); return contents.trim();