mirror of
https://github.com/actions/setup-go.git
synced 2025-08-14 12:45:08 +00:00
Merge 6ecdea2b649cf54f04d23e9235d7a28e626bb247 into e75c3e80bcde46e322cd5845ae46582947c9becd
This commit is contained in:
commit
facb605f09
4
dist/setup/index.js
vendored
4
dist/setup/index.js
vendored
@ -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) {
|
||||
|
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user