Skip to content
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
9 changes: 5 additions & 4 deletions .github/workflows/ios-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
xcode: [ "15.4", "16.0" ]
os: [ macos-14 ]
xcode: [ "16.0", "16.1" ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}

env:
Expand All @@ -43,7 +44,7 @@ jobs:
run: |
set -o pipefail && \
NSUnbufferedIO=YES \
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 15" \
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 16" \
| xcbeautify --renderer github-actions

build-ios:
Expand All @@ -53,5 +54,5 @@ jobs:
needs: build-ios-matrix
steps:
- name: Check build matrix status
if: ${{ needs.build-ios-matrix.result == 'failure' }}
if: ${{ needs.build-ios-matrix.result != 'success' }}
run: exit 1
12 changes: 4 additions & 8 deletions .github/workflows/linux-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
swift: [ "swift:5.10.1", "swiftlang/swift:nightly-6.0" ]
os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ]
exclude:
- swift: "swiftlang/swift:nightly-6.0"
os: "mantic"
- swift: "swiftlang/swift:nightly-6.0"
os: "noble"
swift: [ "swift:6.0.2" ]
os: [ amazonlinux2, focal, jammy, rhel-ubi9, noble ]

container:
image: ${{ matrix.swift }}-${{ matrix.os }}
Expand All @@ -58,5 +54,5 @@ jobs:
needs: matrix
steps:
- name: Check build matrix status
if: ${{ needs.matrix.result == 'failure' }}
if: ${{ needs.matrix.result != 'success' }}
run: exit 1
7 changes: 4 additions & 3 deletions .github/workflows/macos-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
xcode: [ "15.4", "16.0" ]
os: [ macos-14 ]
xcode: [ "16.0", "16.1" ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}

env:
Expand All @@ -53,5 +54,5 @@ jobs:
needs: build-macos-matrix
steps:
- name: Check build matrix status
if: ${{ needs.build-macos-matrix.result == 'failure' }}
if: ${{ needs.build-macos-matrix.result != 'success' }}
run: exit 1
7 changes: 4 additions & 3 deletions .github/workflows/tvos-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
xcode: [ "15.4", "16.0" ]
os: [ macos-14 ]
xcode: [ "16.0", "16.1" ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}

env:
Expand All @@ -53,5 +54,5 @@ jobs:
needs: build-tvos-matrix
steps:
- name: Check build matrix status
if: ${{ needs.build-tvos-matrix.result == 'failure' }}
if: ${{ needs.build-tvos-matrix.result != 'success' }}
run: exit 1
7 changes: 4 additions & 3 deletions .github/workflows/visionos-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
xcode: [ "15.4", "16.0" ]
os: [ macos-14 ]
xcode: [ "16.0", "16.1" ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}

env:
Expand All @@ -53,5 +54,5 @@ jobs:
needs: build-visionos-matrix
steps:
- name: Check build matrix status
if: ${{ needs.build-visionos-matrix.result == 'failure' }}
if: ${{ needs.build-visionos-matrix.result != 'success' }}
run: exit 1
9 changes: 5 additions & 4 deletions .github/workflows/watchos-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ jobs:
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
needs: check-changes
strategy:
fail-fast: false
matrix:
xcode: [ "15.4", "16.0" ]
os: [ macos-14 ]
xcode: [ "16.0", "16.1" ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}

env:
Expand All @@ -43,7 +44,7 @@ jobs:
run: |
set -o pipefail && \
NSUnbufferedIO=YES \
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)" \
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)" \
| xcbeautify --renderer github-actions

build-watchos:
Expand All @@ -53,5 +54,5 @@ jobs:
needs: build-watchos-matrix
steps:
- name: Check build matrix status
if: ${{ needs.build-watchos-matrix.result == 'failure' }}
if: ${{ needs.build-watchos-matrix.result != 'success' }}
run: exit 1
24 changes: 6 additions & 18 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,7 @@ let package = Package(
dependencies: .init {
Package.Dependency.package(url: "https://github.com/apple/swift-async-algorithms.git", from: "1.0.0")
Package.Dependency.package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.54.1")
Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "600.0.0-prerelease-2024-06-12")

#if os(Linux)
// Linux does not come bundled with swift-testing
Package.Dependency.package(url: "https://github.com/apple/swift-testing.git", exact: "0.11.0")
#endif

Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", .upToNextMajor(from: "600.0.1"))
},

targets: .init {
Expand All @@ -43,22 +37,16 @@ let package = Package(
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency"),
.swiftLanguageMode(.v6),
]
)
Target.testTarget(
name: "VexilTests",
dependencies: .init {
Target.Dependency.target(name: "Vexil")

#if os(Linux)
// Linux does not come bundled with swift-testing
Target.Dependency.product(name: "Testing", package: "swift-testing")
#endif

},
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency"),
.swiftLanguageMode(.v6),
]
)

Expand All @@ -82,7 +70,7 @@ let package = Package(
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency"),
.swiftLanguageMode(.v6),
]
)

Expand All @@ -96,15 +84,15 @@ let package = Package(
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency"),
.swiftLanguageMode(.v6),
]
)

#endif

},

swiftLanguageVersions: [
swiftLanguageModes: [
.v6,
]

Expand Down
129 changes: 0 additions & 129 deletions [email protected]

This file was deleted.

12 changes: 0 additions & 12 deletions Tests/VexilTests/BoxedFlagValueDecodingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,6 @@ import Foundation
import Testing
@testable import Vexil

#if compiler(<6)

import XCTest

final class BoxedFlagValueDecodingTestCase: XCTestCase {
func testSwiftTesting() async {
await XCTestScaffold.runTestsInSuite(BoxedFlagValueDecodingTests.self, hostedBy: self)
}
}

#endif

@Suite("BoxedFlagValue decoding", .tags(.boxing, .codable))
struct BoxedFlagValueDecodingTests {

Expand Down
12 changes: 0 additions & 12 deletions Tests/VexilTests/BoxedFlagValueEncodingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,6 @@ import Foundation
import Testing
@testable import Vexil

#if compiler(<6)

import XCTest

final class BoxedFlagValueEncodingTestCase: XCTestCase {
func testSwiftTesting() async {
await XCTestScaffold.runTestsInSuite(BoxedFlagValueEncodingTests.self, hostedBy: self)
}
}

#endif

@Suite("BoxedFlagValue encoding", .tags(.boxing, .codable))
struct BoxedFlagValueEncodingTests {

Expand Down
12 changes: 0 additions & 12 deletions Tests/VexilTests/EquatableTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,6 @@ import Combine
import Testing
@testable import Vexil

#if compiler(<6)

import XCTest

final class EquatableTestCase: XCTestCase {
func testSwiftTesting() async {
await XCTestScaffold.runTestsInSuite(EquatableTests.self, hostedBy: self)
}
}

#endif

@Suite("Equatable Tests", .tags(.pole))
struct EquatableTests {

Expand Down
Loading
Loading