Apply PR suggestions

This commit is contained in:
panticmilos 2022-11-21 17:09:26 +01:00
parent 5552b45f54
commit 317adaa2cb
5 changed files with 120 additions and 75 deletions

View file

@ -8,7 +8,6 @@ import fs from 'fs';
import os from 'os';
type InstallationType = 'dist' | 'manifest';
export type StableAliasType = 'stable' | 'oldstable';
export interface IGoVersionFile {
filename: string;
@ -34,7 +33,8 @@ export async function getGo(
versionSpec: string,
checkLatest: boolean,
auth: string | undefined,
arch = os.arch()
arch = os.arch(),
releases: tc.IToolRelease[] | undefined
) {
let osPlat: string = os.platform();
@ -44,7 +44,8 @@ export async function getGo(
versionSpec,
true,
auth,
arch
arch,
releases
);
if (resolvedVersion) {
versionSpec = resolvedVersion;
@ -119,10 +120,17 @@ export async function resolveVersionFromManifest(
versionSpec: string,
stable: boolean,
auth: string | undefined,
arch: string
arch: string,
releases: tc.IToolRelease[] | undefined
): Promise<string | undefined> {
try {
const info = await getInfoFromManifest(versionSpec, stable, auth, arch);
const info = await getInfoFromManifest(
versionSpec,
stable,
auth,
arch,
releases
);
return info?.resolvedVersion;
} catch (err) {
core.info('Unable to resolve a version from the manifest...');
@ -175,28 +183,23 @@ export async function extractGoArchive(archivePath: string): Promise<string> {
return extPath;
}
export async function getAllReleases(auth: string | undefined) {
return await tc.getManifestFromRepo('actions', 'go-versions', auth, 'main');
}
export async function getInfoFromManifest(
versionSpec: string | StableAliasType,
versionSpec: string,
stable: boolean,
auth: string | undefined,
arch = os.arch()
arch = os.arch(),
releases?: tc.IToolRelease[] | undefined
): Promise<IGoVersionInfo | null> {
let info: IGoVersionInfo | null = null;
const releases = await tc.getManifestFromRepo(
'actions',
'go-versions',
auth,
'main'
);
releases = releases ? releases : await getAllReleases(auth);
core.info(`matching ${versionSpec}...`);
let rel: tc.IToolRelease | undefined;
if (versionSpec === 'stable') {
rel = releases[0];
} else {
rel = await tc.findFromManifest(versionSpec, stable, releases, arch);
}
let rel = await tc.findFromManifest(versionSpec, stable, releases, arch);
if (rel && rel.files.length > 0) {
info = <IGoVersionInfo>{};

View file

@ -8,6 +8,8 @@ import {isCacheFeatureAvailable} from './cache-utils';
import cp from 'child_process';
import fs from 'fs';
import os from 'os';
import {IToolRelease} from '@actions/tool-cache';
import {StableReleaseAlias} from './utils';
export async function run() {
try {
@ -30,17 +32,28 @@ export async function run() {
let token = core.getInput('token');
let auth = !token ? undefined : `token ${token}`;
const releases = await installer.getAllReleases(auth);
const checkLatest = core.getBooleanInput('check-latest');
if (versionSpec === 'stable' || versionSpec === 'oldstable') {
versionSpec = await resolveStableVersionInput(versionSpec, auth, arch);
if (
versionSpec === StableReleaseAlias.Stable ||
versionSpec === StableReleaseAlias.OldStable
) {
versionSpec = await resolveStableVersionInput(
versionSpec,
auth,
arch,
releases
);
}
const installDir = await installer.getGo(
versionSpec,
checkLatest,
auth,
arch
arch,
releases
);
core.addPath(path.join(installDir, 'bin'));
@ -150,36 +163,36 @@ function resolveVersionInput(): string {
}
async function resolveStableVersionInput(
versionSpec: installer.StableAliasType,
versionSpec: string,
auth: string | undefined,
arch = os.arch()
arch = os.arch(),
releases: IToolRelease[]
): Promise<string> {
let resolvedVersion = await installer.resolveVersionFromManifest(
'stable',
true,
auth,
arch
);
if (versionSpec === StableReleaseAlias.Stable) {
core.info(`Stable version resolved as ${releases[0].version}`);
core.info(`Stable version resolved as ${resolvedVersion}`);
return releases[0].version;
} else {
const versions = releases.map(
release =>
`${semver.major(release.version)}.${semver.minor(release.version)}`
);
const uniqueVersions = Array.from(new Set(versions));
if (versionSpec === 'oldstable') {
if (resolvedVersion) {
// example: if version is 1.19.4, semver expression will be: <1.19.0
const semverExpression = `<${semver.major(
resolvedVersion
)}.${semver.minor(resolvedVersion)}.0`;
core.info(`Oldstable version resolved as ${uniqueVersions[1]}`);
resolvedVersion = await installer.resolveVersionFromManifest(
semverExpression,
true,
auth,
arch
);
const oldstableVersion = await installer.getInfoFromManifest(
versionSpec,
true,
auth,
arch,
releases
);
core.info(`Oldstable version resolved as ${resolvedVersion}`);
if (!oldstableVersion) {
return versionSpec;
}
}
return resolvedVersion ? resolvedVersion : versionSpec;
return oldstableVersion.resolvedVersion;
}
}

4
src/utils.ts Normal file
View file

@ -0,0 +1,4 @@
export enum StableReleaseAlias {
Stable = 'stable',
OldStable = 'oldstable'
}