Merge branch 'main' into go-version-from-file

src/installer.ts

@@ -30,12 +30,27 @@ export interface IGoVersionInfo {
 
 export async function getGo(
   versionSpec: string,
-  stable: boolean,
+  checkLatest: boolean,
   auth: string | undefined
 ) {
   let osPlat: string = os.platform();
   let osArch: string = os.arch();
 
+  if (checkLatest) {
+    core.info('Attempting to resolve the latest version from the manifest...');
+    const resolvedVersion = await resolveVersionFromManifest(
+      versionSpec,
+      true,
+      auth
+    );
+    if (resolvedVersion) {
+      versionSpec = resolvedVersion;
+      core.info(`Resolved as '${versionSpec}'`);
+    } else {
+      core.info(`Failed to resolve version ${versionSpec} from manifest`);
+    }
+  }
+
   // check cache
   let toolPath: string;
   toolPath = tc.find('go', versionSpec);
@@ -52,7 +67,7 @@ export async function getGo(
   // Try download from internal distribution (popular versions only)
   //
   try {
-    info = await getInfoFromManifest(versionSpec, stable, auth);
+    info = await getInfoFromManifest(versionSpec, true, auth);
     if (info) {
       downloadPath = await installGoVersion(info, auth);
     } else {
@@ -79,7 +94,7 @@ export async function getGo(
   // Download from storage.googleapis.com
   //
   if (!downloadPath) {
-    info = await getInfoFromDist(versionSpec, stable);
+    info = await getInfoFromDist(versionSpec);
     if (!info) {
       throw new Error(
         `Unable to find Go version '${versionSpec}' for platform ${osPlat} and architecture ${osArch}.`
@@ -97,6 +112,20 @@ export async function getGo(
   return downloadPath;
 }
 
+async function resolveVersionFromManifest(
+  versionSpec: string,
+  stable: boolean,
+  auth: string | undefined
+): Promise<string | undefined> {
+  try {
+    const info = await getInfoFromManifest(versionSpec, stable, auth);
+    return info?.resolvedVersion;
+  } catch (err) {
+    core.info('Unable to resolve a version from the manifest...');
+    core.debug(err.message);
+  }
+}
+
 async function installGoVersion(
   info: IGoVersionInfo,
   auth: string | undefined
@@ -122,10 +151,10 @@ async function installGoVersion(
 }
 
 export async function extractGoArchive(archivePath: string): Promise<string> {
-  const arch = os.arch();
+  const platform = os.platform();
   let extPath: string;
 
-  if (arch === 'win32') {
+  if (platform === 'win32') {
     extPath = await tc.extractZip(archivePath);
   } else {
     extPath = await tc.extractTar(archivePath);
@@ -140,7 +169,12 @@ export async function getInfoFromManifest(
   auth: string | undefined
 ): Promise<IGoVersionInfo | null> {
   let info: IGoVersionInfo | null = null;
-  const releases = await tc.getManifestFromRepo('actions', 'go-versions', auth);
+  const releases = await tc.getManifestFromRepo(
+    'actions',
+    'go-versions',
+    auth,
+    'main'
+  );
   core.info(`matching ${versionSpec}...`);
   const rel = await tc.findFromManifest(versionSpec, stable, releases);
 
@@ -156,11 +190,10 @@ export async function getInfoFromManifest(
 }
 
 async function getInfoFromDist(
-  versionSpec: string,
-  stable: boolean
+  versionSpec: string
 ): Promise<IGoVersionInfo | null> {
   let version: IGoVersion | undefined;
-  version = await findMatch(versionSpec, stable);
+  version = await findMatch(versionSpec);
   if (!version) {
     return null;
   }
@@ -176,8 +209,7 @@ async function getInfoFromDist(
 }
 
 export async function findMatch(
-  versionSpec: string,
-  stable: boolean
+  versionSpec: string
 ): Promise<IGoVersion | undefined> {
   let archFilter = sys.getArch();
   let platFilter = sys.getPlatform();
@@ -198,18 +230,8 @@ export async function findMatch(
     let candidate: IGoVersion = candidates[i];
     let version = makeSemver(candidate.version);
 
-    // 1.13.0 is advertised as 1.13 preventing being able to match exactly 1.13.0
-    // since a semver of 1.13 would match latest 1.13
-    let parts: string[] = version.split('.');
-    if (parts.length == 2) {
-      version = version + '.0';
-    }
-
     core.debug(`check ${version} satisfies ${versionSpec}`);
-    if (
-      semver.satisfies(version, versionSpec) &&
-      (!stable || candidate.stable === stable)
-    ) {
+    if (semver.satisfies(version, versionSpec)) {
       goFile = candidate.files.find(file => {
         core.debug(
           `${file.arch}===${archFilter} && ${file.os}===${platFilter}`
@@ -249,22 +271,32 @@ export async function getVersionsDist(
 // Convert the go version syntax into semver for semver matching
 // 1.13.1 => 1.13.1
 // 1.13 => 1.13.0
-// 1.10beta1 => 1.10.0-beta1, 1.10rc1 => 1.10.0-rc1
-// 1.8.5beta1 => 1.8.5-beta1, 1.8.5rc1 => 1.8.5-rc1
+// 1.10beta1 => 1.10.0-beta.1, 1.10rc1 => 1.10.0-rc.1
+// 1.8.5beta1 => 1.8.5-beta.1, 1.8.5rc1 => 1.8.5-rc.1
 export function makeSemver(version: string): string {
   version = version.replace('go', '');
-  version = version.replace('beta', '-beta').replace('rc', '-rc');
+  version = version.replace('beta', '-beta.').replace('rc', '-rc.');
   let parts = version.split('-');
 
-  let verPart: string = parts[0];
-  let prereleasePart = parts.length > 1 ? `-${parts[1]}` : '';
-
-  let verParts: string[] = verPart.split('.');
-  if (verParts.length == 2) {
-    verPart += '.0';
+  let semVersion = semver.coerce(parts[0])?.version;
+  if (!semVersion) {
+    throw new Error(
+      `The version: ${version} can't be changed to SemVer notation`
+    );
   }
 
-  return `${verPart}${prereleasePart}`;
+  if (!parts[1]) {
+    return semVersion;
+  }
+
+  const fullVersion = semver.valid(`${semVersion}-${parts[1]}`);
+
+  if (!fullVersion) {
+    throw new Error(
+      `The version: ${version} can't be changed to SemVer notation`
+    );
+  }
+  return fullVersion;
 }
 
 export function parseGoVersionFile(contents: string, isMod: boolean): string {