Skip to content

Commit

Permalink
Add Xcode 13 to test matrix. (#375)
Browse files Browse the repository at this point in the history
  • Loading branch information
ileitch authored Jul 20, 2021
1 parent 610fe97 commit 6faac27
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 24 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ jobs:
strategy:
fail-fast: false
matrix:
xcode: [12.5, 12.4, 12.3, 12.2, 12.1]
xcode: ["13.0", "12.5.1", "12.4", "12.3", "12.2", "12.1"]
include:
- xcode: 12.5
- xcode: "13.0"
macos: macOS-11
- xcode: 12.4
- xcode: "12.5.1"
macos: macOS-11
- xcode: 12.3
- xcode: "12.4"
macos: macOS-11
- xcode: "12.3"
macos: macOS-10.15
- xcode: 12.2
- xcode: "12.2"
macos: macOS-10.15
- xcode: 12.1
- xcode: "12.1"
macos: macOS-10.15
runs-on: ${{ matrix.macos }}
name: macOS
Expand Down Expand Up @@ -65,10 +67,10 @@ jobs:
- swift: nightly-5.5
container: "swiftlang/swift:nightly-5.5-focal"
cache-version: 2
- swift: 5.4
- swift: "5.4"
container: "swift:5.4"
cache-version: 2
- swift: 5.3
- swift: "5.3"
container: "swift:5.3"
cache-version: 1
runs-on: ubuntu-20.04
Expand Down
22 changes: 6 additions & 16 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,13 @@ var dependencies: [Package.Dependency] = [
]

#if swift(>=5.5)
#if os(macOS)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.branch("release/5.5-05142021")
)
)
#else
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.branch("release/5.5")
)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.revision("9a8d3d8b9fb42bdd9cffc18219b5efb584b5b998")
)
#endif
)
#elseif swift(>=5.4)
dependencies.append(
.package(
Expand Down

0 comments on commit 6faac27

Please sign in to comment.