Skip to content

Commit

Permalink
Target only 5.9
Browse files Browse the repository at this point in the history
  • Loading branch information
STREGA committed Oct 1, 2023
1 parent eed2636 commit 3bd8c1e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 134 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@ jobs:
strategy:
matrix:
include:
- os: macos-12
swift_version: 5.7
xcode: /Applications/Xcode_14.0.app/Contents/Developer
- os: macos-13
swift_version: 5.8
xcode: /Applications/Xcode_14.3.app/Contents/Developer
- os: macos-13 # TODO: macos-14 runner expected in October-December 2023
swift_version: 5.9
xcode: /Applications/Xcode_15.0.app/Contents/Developer
- os: ubuntu-20.04
swift_version:
swift_version: 5.9
name: Build on ${{ matrix.os }} with Swift ${{ matrix.swift_version }}
timeout-minutes: 40
runs-on: ${{ matrix.os }}
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -21,16 +21,16 @@ let package = Package(
),
.package(
url: "https://github.com/apple/swift-argument-parser.git",
exact: "1.0.3"
.upToNextMinor(from: "1.2.2")
),
.package(url: "https://github.com/apple/swift-nio.git", from: "2.34.0"),
.package(
url: "https://github.com/apple/swift-package-manager.git",
branch: "release/5.8"
branch: "release/5.9"
),
.package(
url: "https://github.com/apple/swift-tools-support-core.git",
branch: "release/5.8"
branch: "release/5.9"
),
.package(url: "https://github.com/vapor/vapor.git", from: "4.57.1"),
.package(url: "https://github.com/apple/swift-crypto.git", from: "2.2.0"),
Expand Down
122 changes: 0 additions & 122 deletions [email protected]

This file was deleted.

1 change: 0 additions & 1 deletion Sources/CartonHelpers/DefaultToolchain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@
// limitations under the License.

// TODO: make this `public let defaultToolchainVersion = "wasm-5.9.0-RELEASE"`
// After a stable wasm-5.9 is released
public let defaultToolchainVersion = "wasm-5.9-SNAPSHOT-2023-08-01-a"

0 comments on commit 3bd8c1e

Please sign in to comment.