Skip to content

Commit

Permalink
Merge pull request #176 from fwal/swft-5.3.3
Browse files Browse the repository at this point in the history
Swift 5.3.3 & 5.3.2
  • Loading branch information
fwal authored Feb 8, 2021
2 parents 933b9af + d6c12dc commit 0da8a2f
Show file tree
Hide file tree
Showing 7 changed files with 6,019 additions and 10 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.3.1", "4.2.1"]
swift: ["5.3.3", "4.2.1"]
steps:
- uses: actions/checkout@v2
- 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 @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
swift: ["5.3.1"]
swift: ["5.3.3"]
steps:
- uses: fwal/setup-swift@v1
with:
Expand All @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
swift: ["5.3.1"]
swift: ["5.3.3"]
steps:
- uses: fwal/setup-swift@v1-next
with:
Expand Down
8 changes: 4 additions & 4 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.3.1-F05138?logo=swift&logoColor=white" alt="Swift 5.3.1" />
<img src="https://img.shields.io/badge/Swift-5.3.3-F05138?logo=swift&logoColor=white" alt="Swift 5.3.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.3.1
run: swift --version # Swift 5.3.3
```

A specific Swift version can be set using the `swift-version` input:
Expand Down Expand Up @@ -68,11 +68,11 @@ 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.3.1`)
- `"5"` will resolve to latest minor and patch version (aka `5.3.3`)

### Caveats

YAML interprets eg. `5.0` as a float, this action will then interpret that as `5` which will result in eg. Swift 5.3.1 being resolved. Quote your inputs! Thus:
YAML interprets eg. `5.0` as a float, this action will then interpret that as `5` which will result in eg. Swift 5.3.3 being resolved. Quote your inputs! Thus:

```
- uses: fwal/setup-swift@v1
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.3.1");
expect(version).toBe("5.3.3");
});

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.3.1'
default: '5.3.3'
outputs:
version:
description: The full Swift version that was configured
Expand Down
Loading

0 comments on commit 0da8a2f

Please sign in to comment.