fixup! Add mirror option

mmarchini · mmarchini · commit 772e9574c060 · 2019-11-06T22:02:33.000-08:00
diff --git a/lib/installer.js b/lib/installer.js
@@ -108,27 +108,40 @@ function queryLatestMatch(versionSpec, mirror) {
         nodeVersions.forEach((nodeVersion) => {
             // ensure this version supports your os and platform
             if (nodeVersion.files.indexOf(dataFileName) >= 0) {
-                versions.push(nodeVersion.version);
+                versions.push(nodeVersion);
             }
         });
         // get the latest version that matches the version spec
         let version = evaluateVersions(versions, versionSpec);
         return version;
     });
 }
+exports.queryLatestMatch = queryLatestMatch;
 // TODO - should we just export this from @actions/tool-cache? Lifted directly from there
 function evaluateVersions(versions, versionSpec) {
     let version = '';
     core.debug(`evaluating ${versions.length} versions`);
     versions = versions.sort((a, b) => {
-        if (semver.gt(a, b)) {
+        const versionA = semver.coerce(a.version);
+        const versionB = semver.coerce(b.version);
+        // If versions are equal, compare date instead
+        if (versionA === versionB || versionA === null || versionB === null) {
+            if (new Date(a.date) > new Date(b.date)) {
+                return 1;
+            }
+            return -1;
+        }
+        if (semver.gt(versionA, versionB)) {
             return 1;
         }
         return -1;
     });
     for (let i = versions.length - 1; i >= 0; i--) {
-        const potential = versions[i];
-        const satisfied = semver.satisfies(potential, versionSpec);
+        const potential = versions[i].version;
+        const semverPotential = semver.coerce(potential);
+        if (semverPotential === null)
+            continue;
+        const satisfied = semver.satisfies(semverPotential, versionSpec);
         if (satisfied) {
             version = potential;
             break;
diff --git a/src/installer.ts b/src/installer.ts
@@ -32,6 +32,7 @@ if (!tempDirectory) {
 //
 interface INodeVersion {
   version: string;
+  date: string;
   files: string[];
 }
 
@@ -81,7 +82,7 @@ export async function getNode(versionSpec: string, mirror: string) {
   core.addPath(toolPath);
 }
 
-async function queryLatestMatch(
+export async function queryLatestMatch(
   versionSpec: string,
   mirror: string
 ): Promise<string> {
@@ -101,15 +102,15 @@ async function queryLatestMatch(
       throw new Error(`Unexpected OS '${osPlat}'`);
   }
 
-  let versions: string[] = [];
+  let versions: INodeVersion[] = [];
   let dataUrl = `${mirror}/index.json`;
   let rest: restm.RestClient = new restm.RestClient('setup-node');
   let nodeVersions: INodeVersion[] =
     (await rest.get<INodeVersion[]>(dataUrl)).result || [];
   nodeVersions.forEach((nodeVersion: INodeVersion) => {
     // ensure this version supports your os and platform
     if (nodeVersion.files.indexOf(dataFileName) >= 0) {
-      versions.push(nodeVersion.version);
+      versions.push(nodeVersion);
     }
   });
 
@@ -119,18 +120,32 @@ async function queryLatestMatch(
 }
 
 // TODO - should we just export this from @actions/tool-cache? Lifted directly from there
-function evaluateVersions(versions: string[], versionSpec: string): string {
+function evaluateVersions(
+  versions: INodeVersion[],
+  versionSpec: string
+): string {
   let version = '';
   core.debug(`evaluating ${versions.length} versions`);
   versions = versions.sort((a, b) => {
-    if (semver.gt(a, b)) {
+    const versionA: semver.SemVer | null = semver.coerce(a.version);
+    const versionB: semver.SemVer | null = semver.coerce(b.version);
+    // If versions are equal, compare date instead
+    if (versionA === versionB || versionA === null || versionB === null) {
+      if (new Date(a.date) > new Date(b.date)) {
+        return 1;
+      }
+      return -1;
+    }
+    if (semver.gt(versionA, versionB)) {
       return 1;
     }
     return -1;
   });
   for (let i = versions.length - 1; i >= 0; i--) {
-    const potential: string = versions[i];
-    const satisfied: boolean = semver.satisfies(potential, versionSpec);
+    const potential: string = versions[i].version;
+    const semverPotential: semver.SemVer | null = semver.coerce(potential);
+    if (semverPotential === null) continue;
+    const satisfied: boolean = semver.satisfies(semverPotential, versionSpec);
     if (satisfied) {
       version = potential;
       break;
