Skip to content

Commit

Permalink
Merge pull request #127 from fwal/swift-5.3
Browse files Browse the repository at this point in the history
Add Swift 5.3
  • Loading branch information
fwal authored Sep 17, 2020
2 parents b0b262a + 43329e0 commit a2e4ceb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 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.2.4", "4.2.4"]
swift: ["5.3", "4.2.4"]
steps:
- uses: actions/checkout@v2
- run: npm install
Expand Down
6 changes: 3 additions & 3 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.2.4-F05138?logo=swift&logoColor=white" alt="Swift 5.2.4" />
<img src="https://img.shields.io/badge/Swift-5.3-F05138?logo=swift&logoColor=white" alt="Swift 5.3" />
</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.2.4
run: swift --version # Swift 5.3
```

A specific Swift version can be set using the `swift-version` input:
Expand Down Expand Up @@ -68,7 +68,7 @@ For example, Swift is available as version `5.1` but this will be interpreted as
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.2.4`)
- `"5"` will resolve to latest minor and patch version (aka `5.3.0`)

### Caveats

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 @@ -23,7 +23,7 @@ describe("swift version resolver", () => {

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

it("throws an error if version is invalid", 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.2.4'
default: '5.3'
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 AVAILABLE_VERSIONS = [
"5.3",
"5.2.4",
"5.2.2",
"5.2.1",
Expand Down

0 comments on commit a2e4ceb

Please sign in to comment.