From 5b6433660630be9d0a33f9b65a51d5f9743df63a Mon Sep 17 00:00:00 2001 From: Rob Amos Date: Wed, 11 Dec 2024 16:18:03 +1100 Subject: [PATCH] Don't short circuit failures, we want to see them. --- .github/workflows/ios-tests.yml | 1 + .github/workflows/linux-tests.yml | 1 + .github/workflows/macos-tests.yml | 3 ++- .github/workflows/tvos-tests.yml | 3 ++- .github/workflows/visionos-tests.yml | 3 ++- .github/workflows/watchos-tests.yml | 3 ++- Package.swift | 12 ------------ 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ios-tests.yml b/.github/workflows/ios-tests.yml index 9055d78..f92ffe4 100644 --- a/.github/workflows/ios-tests.yml +++ b/.github/workflows/ios-tests.yml @@ -28,6 +28,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: xcode: [ "16.0", "16.1" ] os: [ macos-14, macos-15 ] diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml index d388712..475d857 100644 --- a/.github/workflows/linux-tests.yml +++ b/.github/workflows/linux-tests.yml @@ -33,6 +33,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: swift: [ "swift:6.0.2" ] os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ] diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml index 53fb94c..f734717 100644 --- a/.github/workflows/macos-tests.yml +++ b/.github/workflows/macos-tests.yml @@ -28,6 +28,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: xcode: [ "16.0", "16.1" ] os: [ macos-14, macos-15 ] @@ -53,5 +54,5 @@ jobs: needs: build-macos-matrix steps: - name: Check build matrix status - if: ${{ needs.build-ios-matrix.result != 'success' }} + if: ${{ needs.build-macos-matrix.result != 'success' }} run: exit 1 diff --git a/.github/workflows/tvos-tests.yml b/.github/workflows/tvos-tests.yml index 8b67e94..182bf1a 100644 --- a/.github/workflows/tvos-tests.yml +++ b/.github/workflows/tvos-tests.yml @@ -28,6 +28,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: xcode: [ "16.0", "16.1" ] os: [ macos-14, macos-15 ] @@ -53,5 +54,5 @@ jobs: needs: build-tvos-matrix steps: - name: Check build matrix status - if: ${{ needs.build-ios-matrix.result != 'success' }} + if: ${{ needs.build-tvos-matrix.result != 'success' }} run: exit 1 diff --git a/.github/workflows/visionos-tests.yml b/.github/workflows/visionos-tests.yml index 409326e..d24a62c 100644 --- a/.github/workflows/visionos-tests.yml +++ b/.github/workflows/visionos-tests.yml @@ -28,6 +28,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: xcode: [ "16.0", "16.1" ] os: [ macos-14, macos-15 ] @@ -53,5 +54,5 @@ jobs: needs: build-visionos-matrix steps: - name: Check build matrix status - if: ${{ needs.build-ios-matrix.result != 'success' }} + if: ${{ needs.build-visionos-matrix.result != 'success' }} run: exit 1 diff --git a/.github/workflows/watchos-tests.yml b/.github/workflows/watchos-tests.yml index dadafc4..5a90fc0 100644 --- a/.github/workflows/watchos-tests.yml +++ b/.github/workflows/watchos-tests.yml @@ -28,6 +28,7 @@ jobs: if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }} needs: check-changes strategy: + fail-fast: false matrix: xcode: [ "16.0", "16.1" ] os: [ macos-14, macos-15 ] @@ -53,5 +54,5 @@ jobs: needs: build-watchos-matrix steps: - name: Check build matrix status - if: ${{ needs.build-ios-matrix.result != 'success' }} + if: ${{ needs.build-watchos-matrix.result != 'success' }} run: exit 1 diff --git a/Package.swift b/Package.swift index 6823c5b..530c085 100644 --- a/Package.swift +++ b/Package.swift @@ -24,12 +24,6 @@ let package = Package( 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", .upToNextMajor(from: "600.0.1")) - -#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 - }, targets: .init { @@ -50,12 +44,6 @@ let package = Package( 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: [ .swiftLanguageMode(.v6),