diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0345af35..ef45e0bd 100644 --- 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 index 95f139d6..32c73f16 100644 --- 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 index 77705af3..3dec1b49 100644 --- 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"], };