Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Swift v6.0 #684

Merged
merged 3 commits into from
Jan 14, 2025
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
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%20%7C%20Windows-lightgray" alt="Supports macOS, Ubuntu & Windows" />
</a>
<a href="https://swift.org">
<img src="https://img.shields.io/badge/Swift-5.10.1-F05138?logo=swift&logoColor=white" alt="Swift 5.10.1" />
<img src="https://img.shields.io/badge/Swift-6.0.2-F05138?logo=swift&logoColor=white" alt="Swift 6.0.2" />
</a>
<a href="https://github.com/swift-actions/setup-swift/releases/latest">
<img src="https://img.shields.io/github/v/release/swift-actions/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: swift-actions/setup-swift@v2
- name: Get swift version
run: swift --version # Swift 5.10.1
run: swift --version # Swift 6.0.2
```

A specific Swift version can be set using the `swift-version` input:
Expand Down
4 changes: 4 additions & 0 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,10 @@ const semver = __importStar(__nccwpck_require__(1383));
const core = __importStar(__nccwpck_require__(2186));
const os_1 = __nccwpck_require__(1855);
const VERSIONS_LIST = [
["6.0.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["6.0.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["6.0.0", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["6.0", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["5.10.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["5.10", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
["5.9.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
Expand Down
4 changes: 4 additions & 0 deletions src/swift-versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import * as core from "@actions/core";
import { System, OS } from "./os";

const VERSIONS_LIST: [string, OS[]][] = [
["6.0.2", [OS.MacOS, OS.Ubuntu]],
["6.0.1", [OS.MacOS, OS.Ubuntu]],
["6.0.0", [OS.MacOS, OS.Ubuntu]],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swift 6.0.1 is out by the way and could be added too.

(Soft bump since it would be really convenient to have this merged)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swift 6.0.2 is out by the way and could be added too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks guys, I've added both 6.0.1 & 6.0.2

["6.0", [OS.MacOS, OS.Ubuntu]],
["5.10.1", [OS.MacOS, OS.Ubuntu]],
["5.10", [OS.MacOS, OS.Ubuntu]],
["5.9.2", [OS.MacOS, OS.Ubuntu]],
Expand Down
Loading