From bf3b42d822f2c54529d755baaad60fc56bf5e8d7 Mon Sep 17 00:00:00 2001 From: kenta okamura Date: Thu, 6 Apr 2023 22:09:28 +0900 Subject: [PATCH 1/3] Add swift 5.8 --- dist/index.js | 1 + src/swift-versions.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/dist/index.js b/dist/index.js index ee04b27b..2b91232f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -540,6 +540,7 @@ const semver = __importStar(__nccwpck_require__(1383)); const core = __importStar(__nccwpck_require__(2186)); const os_1 = __nccwpck_require__(1855); const VERSIONS_LIST = [ + ["5.8", [os_1.OS.MacOS, os_1.OS.Ubuntu]], ["5.7.3", [os_1.OS.MacOS, os_1.OS.Ubuntu]], ["5.7.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]], ["5.7.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]], diff --git a/src/swift-versions.ts b/src/swift-versions.ts index 5ec36825..714be7f7 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.8", [OS.MacOS, OS.Ubuntu]], ["5.7.3", [OS.MacOS, OS.Ubuntu]], ["5.7.2", [OS.MacOS, OS.Ubuntu]], ["5.7.1", [OS.MacOS, OS.Ubuntu]], From 43cd9fcfc1c99c3c315b577a7367710decf80b50 Mon Sep 17 00:00:00 2001 From: kenta okamura Date: Thu, 6 Apr 2023 22:12:32 +0900 Subject: [PATCH 2/3] Update ci --- .github/workflows/ci.yml | 6 +++--- .github/workflows/stability.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b172612..32f5bb4a 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.7.3"] + swift: ["5.8"] include: - os: macos-12 - swift: "5.7.3" + swift: "5.8" - os: ubuntu-22.04 - swift: "5.7.3" + swift: "5.8" - os: windows-latest swift: "5.6.3" steps: diff --git a/.github/workflows/stability.yml b/.github/workflows/stability.yml index ea262a6d..2daacb81 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.7"] + swift: ["5.8"] steps: - uses: swift-actions/setup-swift@v1 with: @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - swift: ["5.7"] + swift: ["5.8"] steps: - uses: swift-actions/setup-swift@main with: From fa1fffcd64c1179313c95a8e8e39bac4dc0a2956 Mon Sep 17 00:00:00 2001 From: kenta okamura Date: Thu, 6 Apr 2023 22:19:51 +0900 Subject: [PATCH 3/3] Update documents and Fix test --- README.md | 6 +++--- __tests__/swift-versions.test.ts | 2 +- action.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bce7448c..f7a61d4f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Supports macOS, Ubuntu & Windows - Swift 5.7.3 + Swift 5.8 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.7.3 + run: swift --version # Swift 5.8 ``` 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.7.3`) +- `"5"` will resolve to latest minor and patch version (aka `5.8`) ### Caveats diff --git a/__tests__/swift-versions.test.ts b/__tests__/swift-versions.test.ts index 6cab592a..b034b98b 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.7.3"); + expect(version).toBe("5.8"); }); it("identifies versions based on system", async () => { diff --git a/action.yml b/action.yml index 9dfae7a2..a2da75c2 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ inputs: swift-version: description: Swift version to configure required: true - default: '5.7.3' + default: '5.8' outputs: version: description: The full Swift version that was configured