Merge pull request #675 from angelapwen/update-available-images

Update available OSes to match available runner images
swift-actions · Jul 3, 2024 · 2fc45c4 · 2fc45c4
2 parents a6ceb06 + 4af1f36
commit 2fc45c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,10 +29,6 @@ jobs:
         os: [ubuntu-latest, macos-latest]
         swift: ["5.10"]
         include:
-        - os: macos-12
-          swift: "5.10"
-        - os: ubuntu-22.04
-          swift: "5.10"
         - os: windows-latest
           swift: "5.6.3"
     steps:

diff --git a/__tests__/os.test.ts b/__tests__/os.test.ts
@@ -6,11 +6,11 @@ const setSystem = require("getos").__setSystem;
 
 describe("os resolver", () => {
   it("finds matching system and version", async () => {
-    setSystem({ os: "linux", dist: "Ubuntu", release: "18.04" });
+    setSystem({ os: "linux", dist: "Ubuntu", release: "22.04" });
 
     let ubuntu = await os.getSystem();
     expect(ubuntu.os).toBe(os.OS.Ubuntu);
-    expect(ubuntu.version).toBe("18.04");
+    expect(ubuntu.version).toBe("22.04");
     expect(ubuntu.name).toBe("Ubuntu");
 
     setSystem({ os: "darwin", dist: "macOS", release: "latest" });

diff --git a/src/os.ts b/src/os.ts
@@ -13,8 +13,8 @@ export namespace OS {
 }
 
 const AVAILABLE_OS: { [platform: string]: string[] } = {
-  macOS: ["latest", "12.0", "11.0", "10.15"],
-  Ubuntu: ["latest", "22.04", "20.04", "18.04", "16.04"],
+  macOS: ["latest", "14", "13", "12", "11"],
+  Ubuntu: ["latest", "24.04", "22.04", "20.04"],
   Windows: ["latest", "10"],
 };