This commit is contained in:
Arne Jørgensen 2026-06-23 10:08:48 +00:00 committed by GitHub
commit c3a3f3e4ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 228 additions and 6 deletions

View file

@ -582,7 +582,10 @@ export async function findMatch(
const version = makeSemver(candidate.version);
core.debug(`check ${version} satisfies ${versionSpec}`);
if (semver.satisfies(version, versionSpec)) {
if (
candidate.version.replace(/^go/, '') === versionSpec ||
semver.satisfies(version, versionSpec)
) {
goFile = candidate.files.find(file => {
core.debug(
`${file.arch}===${archFilter} && ${file.os}===${platFilter}`
@ -670,7 +673,7 @@ export function parseGoVersionFile(versionFilePath: string): string {
}
// go directive: https://go.dev/ref/mod#go-mod-file-go
const matchGo = contents.match(/^go (\d+(\.\d+)*)/m);
const matchGo = contents.match(/^go (\d+(\.\d+)*(?:\.\d+|(beta|rc)\d+)?)/m);
return matchGo ? matchGo[1] : '';
} else if (path.basename(versionFilePath) === '.tool-versions') {
const match = contents.match(/^golang\s+([^\n#]+)/m);