Skip to content

Commit cbaec96

Browse files
authored
Merge branch 'main' into feature/node20
2 parents 346ae58 + 92f3eaf commit cbaec96

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest, macos-latest]
26-
swift: ["5.9.2"]
26+
swift: ["5.10"]
2727
include:
2828
- os: macos-12
29-
swift: "5.9.2"
29+
swift: "5.10"
3030
- os: ubuntu-22.04
31-
swift: "5.9.2"
31+
swift: "5.10"
3232
- os: windows-latest
3333
swift: "5.6.3"
3434
steps:

.github/workflows/stability.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest, macos-latest]
14-
swift: ["5.9.2"]
14+
swift: ["5.10"]
1515
steps:
1616
- uses: swift-actions/setup-swift@v1
1717
with:
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
os: [ubuntu-latest, macos-latest]
28-
swift: ["5.9.2"]
28+
swift: ["5.10"]
2929
steps:
3030
- uses: swift-actions/setup-swift@main
3131
with:

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ lib/
6060

6161
# next.js build output
6262
.next
63+
64+
# vi swap file
65+
.*.swp

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<img src="https://img.shields.io/badge/platform-macOS%20%7C%20Ubuntu%20%7C%20Windows-lightgray" alt="Supports macOS, Ubuntu & Windows" />
88
</a>
99
<a href="https://swift.org">
10-
<img src="https://img.shields.io/badge/Swift-5.9.2-F05138?logo=swift&logoColor=white" alt="Swift 5.9.2" />
10+
<img src="https://img.shields.io/badge/Swift-5.10-F05138?logo=swift&logoColor=white" alt="Swift 5.10" />
1111
</a>
1212
<a href="https://github.com/swift-actions/setup-swift/releases/latest">
1313
<img src="https://img.shields.io/github/v/release/swift-actions/setup-swift?sort=semver" alt="Latest release" />
@@ -28,7 +28,7 @@ After the environment is configured you can run swift commands using the standar
2828
```yaml
2929
- uses: swift-actions/setup-swift@v1
3030
- name: Get swift version
31-
run: swift --version # Swift 5.9.2
31+
run: swift --version # Swift 5.10
3232
```
3333

3434
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
6868
In other words specifying...
6969
- `"5.1.0"` will resolve to version `5.1`
7070
- `"5.1"` will resolve to latest patch version (aka `5.1.1`)
71-
- `"5"` will resolve to latest minor and patch version (aka `5.9.2`)
71+
- `"5"` will resolve to latest minor and patch version (aka `5.10`)
7272

7373
### Caveats
7474

__tests__/swift-versions.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe("swift version resolver", () => {
2828

2929
it("identifies X versions", async () => {
3030
const version = await versions.verify("5", macOS);
31-
expect(version).toBe("5.9.2");
31+
expect(version).toBe("5.10");
3232
});
3333

3434
it("identifies versions based on system", async () => {

action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
swift-version:
66
description: Swift version to configure
77
required: true
8-
default: '5.9.2'
8+
default: '5.10'
99
outputs:
1010
version:
1111
description: The full Swift version that was configured

dist/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ const semver = __importStar(__nccwpck_require__(1383));
460460
const core = __importStar(__nccwpck_require__(2186));
461461
const os_1 = __nccwpck_require__(1855);
462462
const VERSIONS_LIST = [
463+
["5.10", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
463464
["5.9.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
464465
["5.9.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
465466
["5.9", [os_1.OS.MacOS, os_1.OS.Ubuntu]],

src/swift-versions.ts

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as core from "@actions/core";
33
import { System, OS } from "./os";
44

55
const VERSIONS_LIST: [string, OS[]][] = [
6+
["5.10", [OS.MacOS, OS.Ubuntu]],
67
["5.9.2", [OS.MacOS, OS.Ubuntu]],
78
["5.9.1", [OS.MacOS, OS.Ubuntu]],
89
["5.9", [OS.MacOS, OS.Ubuntu]],

0 commit comments

Comments
 (0)