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

Cover edge cases when version doesnt exist

This commit is contained in:
panticmilos 2022-12-06 14:57:47 +01:00
parent 7d444ba1e9
commit 6df87edb46
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/setup/index.js vendored
View File

@ -63405,7 +63405,7 @@ function findMatch(versionSpec, 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) });
}); });
versionSpec = yield resolveStableVersionInput(versionSpec, undefined, arch, fixedCandidates); versionSpec = yield resolveStableVersionInput(versionSpec, undefined, archFilter, fixedCandidates);
} }
let goFile; let goFile;
for (let i = 0; i < candidates.length; i++) { for (let i = 0; i < candidates.length; i++) {
@ -63480,6 +63480,7 @@ function parseGoVersionFile(versionFilePath) {
} }
exports.parseGoVersionFile = parseGoVersionFile; exports.parseGoVersionFile = parseGoVersionFile;
function resolveStableVersionInput(versionSpec, auth, arch = os_1.default.arch(), manifest) { function resolveStableVersionInput(versionSpec, auth, arch = os_1.default.arch(), manifest) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (!manifest) { if (!manifest) {
core.debug('No manifest cached'); core.debug('No manifest cached');
@ -63496,7 +63497,7 @@ function resolveStableVersionInput(versionSpec, auth, arch = os_1.default.arch()
.filter(item => !!item); .filter(item => !!item);
if (versionSpec === utils_1.StableReleaseAlias.Stable) { if (versionSpec === utils_1.StableReleaseAlias.Stable) {
core.info(`stable version resolved as ${releases[0]}`); core.info(`stable version resolved as ${releases[0]}`);
return releases[0]; return (_a = releases[0]) !== null && _a !== void 0 ? _a : versionSpec;
} }
else { else {
const versions = releases.map(release => `${semver.major(release)}.${semver.minor(release)}`); const versions = releases.map(release => `${semver.major(release)}.${semver.minor(release)}`);

4
src/installer.ts
View File

@ -277,7 +277,7 @@ export async function findMatch(
versionSpec = await resolveStableVersionInput( versionSpec = await resolveStableVersionInput(
versionSpec, versionSpec,
undefined, undefined,
arch, archFilter,
fixedCandidates fixedCandidates
); );
} }
@ -394,7 +394,7 @@ export async function resolveStableVersionInput(
if (versionSpec === StableReleaseAlias.Stable) { if (versionSpec === StableReleaseAlias.Stable) {
core.info(`stable version resolved as ${releases[0]}`); core.info(`stable version resolved as ${releases[0]}`);
return releases[0]; return releases[0] ?? versionSpec;
} else { } else {
const versions = releases.map( const versions = releases.map(
release => `${semver.major(release)}.${semver.minor(release)}` release => `${semver.major(release)}.${semver.minor(release)}`