Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update available OSes to match available runner images #675

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Update available OSes to match available runner images #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe80ca5
Update available OSes to match available runner images
angelapwen Jun 28, 2024
5040710
Remove duplicate integration tests from matrix
angelapwen Jun 28, 2024
4af1f36
Update ubuntu version used in tests
angelapwen Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
fwal marked this conversation as resolved.
Show resolved Hide resolved
- os: windows-latest
swift: "5.6.3"
steps:
Expand Down
4 changes: 2 additions & 2 deletions __tests__/os.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" });
Expand Down
4 changes: 2 additions & 2 deletions src/os.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
};

Expand Down
Loading