Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.1", "4.2.4"]
swift: ["5.2.4", "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.2-F05138?logo=swift&logoColor=white" alt="GitHub Action" />
<img src="https://img.shields.io/badge/Swift-5.2.4-F05138?logo=swift&logoColor=white" alt="GitHub Action" />
</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.2
run: swift --version # Swift 5.2.4
```

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.2`)
- `"5"` will resolve to latest minor and patch version (aka `5.2.4`)


## Legal
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.2");
expect(version).toBe("5.2.4");
});

it("throws an error if version is invalid", async () => {
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.2.4",
"5.2.2",
"5.2.1",
"5.2",
Expand Down