Merge pull request #139 from fwal/system-tracking

Track supported OS:es for each Swift version

Author: fwal

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        swift: ["5.3", "4.2.4"]
+        swift: ["5.3", "4.2.1"]
     steps:
     - uses: actions/checkout@v2
     - run: npm install

__tests__/swift-versions.test.ts

@@ -1,35 +1,56 @@
+import { OS, System } from "../src/os";
 import * as versions from "../src/swift-versions";
 
+const macOS: System = { os: OS.MacOS, version: "latest", name: "macOS" };
+const ubuntu: System = { os: OS.Ubuntu, version: "latest", name: "Ubuntu" };
+
 describe("swift version resolver", () => {
   it("identifies X.X.X versions", async () => {
-    const version = await versions.verify("5.0.3");
-    expect(version).toBe("5.0.3");
+    const version = await versions.verify("5.0.1", macOS);
+    expect(version).toBe("5.0.1");
   });
 
   it("identifies X.X.0 versions", async () => {
-    const version = await versions.verify("5.0.0");
+    const version = await versions.verify("5.0.0", macOS);
     expect(version).toBe("5.0");
   });
 
   it("identifies X.X versions", async () => {
-    const version = await versions.verify("5.0");
-    expect(version).toBe("5.0.3");
+    const version = await versions.verify("5.0", macOS);
+    expect(version).toBe("5.0.1");
   });
 
   it("identifies ~X.X versions", async () => {
-    const version = await versions.verify("~5.0");
-    expect(version).toBe("5.0.3");
+    const version = await versions.verify("~5.0", macOS);
+    expect(version).toBe("5.0.1");
   });
 
   it("identifies X versions", async () => {
-    const version = await versions.verify("5");
+    const version = await versions.verify("5", macOS);
     expect(version).toBe("5.3");
   });
 
+  it("identifies versions based on system", async () => {
+    const macVersion = await versions.verify("5.0", macOS);
+    expect(macVersion).toBe("5.0.1");
+
+    const ubuntuVersion = await versions.verify("5.0", ubuntu);
+    expect(ubuntuVersion).toBe("5.0.3");
+  });
+
+  it("throws an error if the version isn't available for the system", async () => {
+    expect.assertions(1);
+    try {
+      await versions.verify("5.0.3", macOS);
+    } catch (e) {
+      expect(e).toEqual(new Error('Version "5.0.3" is not available'));
+    }
+  });
+
   it("throws an error if version is invalid", async () => {
     expect.assertions(1);
     try {
-      await versions.verify("foo");
+      await versions.verify("foo", macOS);
     } catch (e) {
       expect(e).toEqual(new Error("Version must be a valid semver format."));
     }
@@ -38,7 +59,7 @@ describe("swift version resolver", () => {
   it("throws an error if no matching version is found", async () => {
     expect.assertions(1);
     try {
-      await versions.verify("1.0");
+      await versions.verify("1.0", macOS);
     } catch (e) {
       expect(e).toEqual(new Error('Version "1.0" is not available'));
     }

src/main.ts

@@ -9,9 +9,10 @@ import { getVersion } from "./get-version";
 async function run() {
   try {
     const requestedVersion = core.getInput("swift-version", { required: true });
-    let version = versions.verify(requestedVersion);
 
     let platform = await system.getSystem();
+    let version = versions.verify(requestedVersion, platform);
+
     switch (platform.os) {
       case system.OS.MacOS:
         await macos.install(version, platform);

src/swift-versions.ts

@@ -2,40 +2,51 @@ import * as semver from "semver";
 import * as core from "@actions/core";
 import { System, OS } from "./os";
 
-const AVAILABLE_VERSIONS = [
-  "5.3",
-  "5.2.4",
-  "5.2.2",
-  "5.2.1",
-  "5.2",
-  "5.1.1",
-  "5.1",
-  "5.0.3",
-  "5.0.2",
-  "5.0.1",
-  "5.0",
-  "4.2.4",
-  "4.2.3",
-  "4.2.2",
-  "4.2.1",
-  "4.2",
-  "4.1.3",
-  "4.1.2",
-  "4.1.1",
-  "4.1",
-  "4.0.3",
-  "4.0.2",
-  "4.0",
-  "3.1.1",
-  "3.1",
-  "3.0.2",
-  "3.0.1",
-  "3.0",
-  "2.2.1",
-  "2.2",
-]
-  .map((version) => semver.coerce(version))
-  .filter(notEmpty);
+const VERSIONS_LIST: [string, OS[]][] = [
+  ["5.3", [OS.MacOS, OS.Ubuntu]],
+  ["5.2.5", [OS.Ubuntu]],
+  ["5.2.4", [OS.MacOS, OS.Ubuntu]],
+  ["5.2.3", [OS.Ubuntu]],
+  ["5.2.2", [OS.MacOS, OS.Ubuntu]],
+  ["5.2.1", [OS.Ubuntu]],
+  ["5.2", [OS.MacOS, OS.Ubuntu]],
+  ["5.1.5", [OS.Ubuntu]],
+  ["5.1.4", [OS.Ubuntu]],
+  ["5.1.3", [OS.MacOS, OS.Ubuntu]],
+  ["5.1.2", [OS.MacOS, OS.Ubuntu]],
+  ["5.1.1", [OS.Ubuntu]],
+  ["5.1", [OS.MacOS, OS.Ubuntu]],
+  ["5.0.3", [OS.Ubuntu]],
+  ["5.0.2", [OS.Ubuntu]],
+  ["5.0.1", [OS.MacOS, OS.Ubuntu]],
+  ["5.0", [OS.MacOS, OS.Ubuntu]],
+  ["4.2.4", [OS.Ubuntu]],
+  ["4.2.3", [OS.Ubuntu]],
+  ["4.2.2", [OS.Ubuntu]],
+  ["4.2.1", [OS.MacOS, OS.Ubuntu]],
+  ["4.2", [OS.MacOS, OS.Ubuntu]],
+  ["4.1.3", [OS.Ubuntu]],
+  ["4.1.2", [OS.MacOS, OS.Ubuntu]],
+  ["4.1.1", [OS.Ubuntu]],
+  ["4.1", [OS.MacOS, OS.Ubuntu]],
+  ["4.0.3", [OS.MacOS, OS.Ubuntu]],
+  ["4.0.2", [OS.MacOS, OS.Ubuntu]],
+  ["4.0", [OS.MacOS, OS.Ubuntu]],
+  ["3.1.1", [OS.MacOS, OS.Ubuntu]],
+  ["3.1", [OS.MacOS, OS.Ubuntu]],
+  ["3.0.2", [OS.MacOS, OS.Ubuntu]],
+  ["3.0.1", [OS.MacOS, OS.Ubuntu]],
+  ["3.0", [OS.MacOS, OS.Ubuntu]],
+  ["2.2.1", [OS.MacOS, OS.Ubuntu]],
+  ["2.2", [OS.MacOS, OS.Ubuntu]],
+];
+
+const AVAILABLE_VERSIONS: [semver.SemVer, OS[]][] = VERSIONS_LIST.map(
+  ([version, os]) => {
+    const semverVersion = semver.coerce(version);
+    return <[semver.SemVer, OS[]]>[semverVersion, os];
+  }
+);
 
 function notEmpty<T>(value: T | null | undefined): value is T {
   return value !== null && value !== undefined;
@@ -72,15 +83,19 @@ export function swiftPackage(version: string, system: System): Package {
   };
 }
 
-export function verify(version: string) {
+export function verify(version: string, system: System) {
   let range = semver.validRange(version);
   if (range === null) {
     throw new Error("Version must be a valid semver format.");
   }
 
   core.debug(`Resolved range ${range}`);
 
-  let matchingVersion = evaluateVersions(AVAILABLE_VERSIONS, version);
+  let systemVersions = AVAILABLE_VERSIONS.filter(([_, os]) =>
+    os.includes(system.os)
+  ).map(([version, _]) => version);
+
+  let matchingVersion = evaluateVersions(systemVersions, version);
   if (matchingVersion === null) {
     throw new Error(`Version "${version}" is not available`);
   }