github
/
setup-go
mirror of https://github.com/actions/setup-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix

This commit is contained in:
Dmitry Shibanov 2022-12-08 22:10:41 +01:00
parent 11e0301e1d
commit 5a5cdc8151
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/setup/index.js vendored
View File

@ -63236,6 +63236,8 @@ function getGo(versionSpec, checkLatest, auth, arch = os_1.default.arch()) {
manifest = yield getManifest(auth); manifest = yield getManifest(auth);
let stableVersion = yield resolveStableVersionInput(versionSpec, arch, osPlat, manifest); let stableVersion = yield resolveStableVersionInput(versionSpec, arch, osPlat, manifest);
if (!stableVersion) { if (!stableVersion) {
let archFilter = sys.getArch(arch);
let platFilter = sys.getPlatform();
const dlUrl = 'https://golang.org/dl/?mode=json&include=all'; const dlUrl = 'https://golang.org/dl/?mode=json&include=all';
let candidates = yield module.exports.getVersionsDist(dlUrl); let candidates = yield module.exports.getVersionsDist(dlUrl);
if (!candidates) { if (!candidates) {
@ -63244,8 +63246,12 @@ function getGo(versionSpec, checkLatest, auth, arch = os_1.default.arch()) {
const fixedCandidates = candidates.map(item => { const fixedCandidates = candidates.map(item => {
return Object.assign(Object.assign({}, item), { version: makeSemver(item.version) }); return Object.assign(Object.assign({}, item), { version: makeSemver(item.version) });
}); });
stableVersion = yield resolveStableVersionInput(versionSpec, arch, osPlat, fixedCandidates); stableVersion = yield resolveStableVersionInput(versionSpec, archFilter, platFilter, fixedCandidates);
if (!stableVersion) {
throw new Error(`Unable to find Go version '${versionSpec}' for platform ${osPlat} and architecture ${arch}.`);
}
} }
versionSpec = stableVersion;
} }
if (checkLatest) { if (checkLatest) {
core.info('Attempting to resolve the latest version from the manifest...'); core.info('Attempting to resolve the latest version from the manifest...');

14
src/installer.ts
View File

@ -52,6 +52,8 @@ export async function getGo(
); );
if (!stableVersion) { if (!stableVersion) {
let archFilter = sys.getArch(arch);
let platFilter = sys.getPlatform();
const dlUrl: string = 'https://golang.org/dl/?mode=json&include=all'; const dlUrl: string = 'https://golang.org/dl/?mode=json&include=all';
let candidates: let candidates:
| IGoVersion[] | IGoVersion[]
@ -69,11 +71,19 @@ export async function getGo(
stableVersion = await resolveStableVersionInput( stableVersion = await resolveStableVersionInput(
versionSpec, versionSpec,
arch, archFilter,
osPlat, platFilter,
fixedCandidates fixedCandidates
); );
if (!stableVersion) {
throw new Error(
`Unable to find Go version '${versionSpec}' for platform ${osPlat} and architecture ${arch}.`
);
}
} }
versionSpec = stableVersion;
} }
if (checkLatest) { if (checkLatest) {