Skip to content

Commit

Permalink
Merge pull request #378 from fwal/swift-5.6
Browse files Browse the repository at this point in the history
Add support for Swift 5.6
  • Loading branch information
fwal authored Mar 15, 2022
2 parents 30cc6da + 9d413d6 commit 6455f67
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
swift: ["5.5.3"]
swift: ["5.6"]
steps:
- uses: actions/checkout@v3
- run: npm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
swift: ["5.5.3"]
swift: ["5.6"]
steps:
- uses: fwal/setup-swift@v1
with:
Expand All @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
swift: ["5.5.3"]
swift: ["5.6"]
steps:
- uses: fwal/setup-swift@main
with:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<img src="https://img.shields.io/badge/platform-macOS%20%7C%20Ubuntu-lightgray" alt="Supports macOS and Ubuntu" />
</a>
<a href="https://swift.org">
<img src="https://img.shields.io/badge/Swift-5.5.3-F05138?logo=swift&logoColor=white" alt="Swift 5.5.3" />
<img src="https://img.shields.io/badge/Swift-5.6-F05138?logo=swift&logoColor=white" alt="Swift 5.6" />
</a>
<a href="https://github.com/fwal/setup-swift/releases/latest">
<img src="https://img.shields.io/github/v/release/fwal/setup-swift?sort=semver" alt="Latest release" />
Expand All @@ -28,7 +28,7 @@ After the environment is configured you can run swift commands using the standar
```yaml
- uses: fwal/setup-swift@v1
- name: Get swift version
run: swift --version # Swift 5.5.3
run: swift --version # Swift 5.6
```

A specific Swift version can be set using the `swift-version` input:
Expand Down
2 changes: 1 addition & 1 deletion __tests__/swift-versions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe("swift version resolver", () => {

it("identifies X versions", async () => {
const version = await versions.verify("5", macOS);
expect(version).toBe("5.5.3");
expect(version).toBe("5.6");
});

it("identifies versions based on system", async () => {
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
swift-version:
description: Swift version to configure
required: true
default: '5.5.3'
default: '5.6'
outputs:
version:
description: The full Swift version that was configured
Expand Down
1 change: 1 addition & 0 deletions src/swift-versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as core from "@actions/core";
import { System, OS } from "./os";

const VERSIONS_LIST: [string, OS[]][] = [
["5.6", [OS.MacOS, OS.Ubuntu]],
["5.5.3", [OS.MacOS, OS.Ubuntu]],
["5.5.2", [OS.MacOS, OS.Ubuntu]],
["5.5.1", [OS.MacOS, OS.Ubuntu]],
Expand Down

0 comments on commit 6455f67

Please sign in to comment.