From fe80ca5014cba51c1ed4cf53518071fce00eda2c Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Fri, 28 Jun 2024 18:08:19 +0200 Subject: [PATCH 1/3] Update available OSes to match available runner images macos-10, ubuntu-18.04 and ubuntu-16.04 are no longer available and have been removed. macos-11 now corresponds to OS version 11.7 and macos-12 now corresponds to OS version 12.7, so the minor versions have been removed from the macOS list. Finally, this commit adds 24.04 to the Ubuntu platform list, as it is now available in beta. See https://github.com/actions/runner-images?tab=readme-ov-file#available-images --- src/os.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"], }; From 50407108cdb6fb3b509975e3daacfdb2dc74989a Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Fri, 28 Jun 2024 18:17:31 +0200 Subject: [PATCH 2/3] Remove duplicate integration tests from matrix These lines should be unnecessary if the intent was to test the latest versions of MacOS and Ubuntu; they are already in the matrix via lines above. --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) 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: From 4af1f36d86b811ff388c3a3b35e41d34ac0558b5 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Mon, 1 Jul 2024 13:46:00 +0200 Subject: [PATCH 3/3] Update ubuntu version used in tests --- __tests__/os.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" });