From 26badc9c962ddbd7d1c0b4e24122316755eed73b Mon Sep 17 00:00:00 2001 From: Frederik Wallner Date: Thu, 28 Sep 2023 21:04:13 +0200 Subject: [PATCH 1/2] Add Swift 5.9 --- __tests__/swift-versions.test.ts | 2 +- src/swift-versions.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/__tests__/swift-versions.test.ts b/__tests__/swift-versions.test.ts index 3f6085b6..3d7bfd76 100644 --- a/__tests__/swift-versions.test.ts +++ b/__tests__/swift-versions.test.ts @@ -28,7 +28,7 @@ describe("swift version resolver", () => { it("identifies X versions", async () => { const version = await versions.verify("5", macOS); - expect(version).toBe("5.8.1"); + expect(version).toBe("5.9"); }); it("identifies versions based on system", async () => { diff --git a/src/swift-versions.ts b/src/swift-versions.ts index a3f6b660..5e85914c 100644 --- a/src/swift-versions.ts +++ b/src/swift-versions.ts @@ -3,6 +3,7 @@ import * as core from "@actions/core"; import { System, OS } from "./os"; const VERSIONS_LIST: [string, OS[]][] = [ + ["5.9", [OS.MacOS, OS.Ubuntu]], ["5.8.1", [OS.MacOS, OS.Ubuntu]], ["5.8", [OS.MacOS, OS.Ubuntu]], ["5.7.3", [OS.MacOS, OS.Ubuntu]], From 3ec3a6cc4413a3cf7d5797e90e481f5c469106f9 Mon Sep 17 00:00:00 2001 From: Frederik Wallner Date: Thu, 28 Sep 2023 21:04:37 +0200 Subject: [PATCH 2/2] Update metadata --- .github/workflows/ci.yml | 6 +++--- .github/workflows/stability.yml | 4 ++-- README.md | 6 +++--- action.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18fb2ca5..49ba9a41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,12 +23,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - swift: ["5.8.1"] + swift: ["5.9"] include: - os: macos-12 - swift: "5.8.1" + swift: "5.9" - os: ubuntu-22.04 - swift: "5.8.1" + swift: "5.9" - os: windows-latest swift: "5.6.3" steps: diff --git a/.github/workflows/stability.yml b/.github/workflows/stability.yml index 19a594e8..34dd3b89 100644 --- a/.github/workflows/stability.yml +++ b/.github/workflows/stability.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - swift: ["5.8.1"] + swift: ["5.9"] steps: - uses: swift-actions/setup-swift@v1 with: @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - swift: ["5.8.1"] + swift: ["5.9"] steps: - uses: swift-actions/setup-swift@main with: diff --git a/README.md b/README.md index 03603567..544fb311 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Supports macOS, Ubuntu & Windows - Swift 5.8.1 + Swift 5.9 Latest release @@ -28,7 +28,7 @@ After the environment is configured you can run swift commands using the standar ```yaml - uses: swift-actions/setup-swift@v1 - name: Get swift version - run: swift --version # Swift 5.8.1 + run: swift --version # Swift 5.9 ``` A specific Swift version can be set using the `swift-version` input: @@ -68,7 +68,7 @@ For example, Swift is available as version `5.1` but using this as value for `sw In other words specifying... - `"5.1.0"` will resolve to version `5.1` - `"5.1"` will resolve to latest patch version (aka `5.1.1`) -- `"5"` will resolve to latest minor and patch version (aka `5.8.1`) +- `"5"` will resolve to latest minor and patch version (aka `5.9`) ### Caveats diff --git a/action.yml b/action.yml index fb8335f6..36b672c4 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ inputs: swift-version: description: Swift version to configure required: true - default: '5.8.1' + default: '5.9' outputs: version: description: The full Swift version that was configured