CI: Don't xcbeautify Swift Testing suites (pointfreeco#3425)

* wip * benchmark update * wip * Add CI for benchmarks * wip * Update benchmark.yml * Update benchmark.yml * Delete Benchmarks/Benchmarks/swift-composable-architecture-benchmark/ Benchmarks.swift * Update benchmark.yml * Update benchmark.yml * Update Benchmarks.swift * wip * Delete .github/workflows/benchmark.yml * Update Benchmarks.swift * Add slight delay for expected failure Test expected failure is flakey, so hopefully will pass more consistently now. --------- Co-authored-by: Brandon Williams <[email protected]>
woookDev · Oct 7, 2024 · 61e3809 · 61e3809
1 parent 00cd6aa
commit 61e3809
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -98,21 +98,21 @@ jobs:
       - name: Update mtime for incremental builds
         uses: chetan/git-restore-mtime-action@v2
       - name: CaseStudies (SwiftUI)
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (SwiftUI)" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (SwiftUI)" xcodebuild-raw
       - name: CaseStudies (UIKit)
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (UIKit)" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (UIKit)" xcodebuild-raw
       - name: Search
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Search" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Search" xcodebuild-raw
       - name: SyncUps
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SyncUps" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SyncUps" xcodebuild-raw
       - name: SpeechRecognition
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SpeechRecognition" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SpeechRecognition" xcodebuild-raw
       - name: TicTacToe
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="TicTacToe" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="TicTacToe" xcodebuild-raw
       - name: Todos
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Todos" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Todos" xcodebuild-raw
       - name: VoiceMemos
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="VoiceMemos" xcodebuild
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="VoiceMemos" xcodebuild-raw
 
   check-macro-compatibility:
     name: Check Macro Compatibility

diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "9b77567b796b05ea9be9bbcac20aca003b91f34244a7fd2740f2b5306c013c45",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -154,5 +155,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Makefile b/Makefile
@@ -39,6 +39,10 @@ TEST_RUNNER_CI = $(CI)
 xcodebuild:
 	$(XCODEBUILD)
 
+# Workaround for debugging Swift Testing tests: https://github.com/cpisciotta/xcbeautify/issues/313
+xcodebuild-raw:
+	$(XCODEBUILD_COMMAND)
+
 build-for-library-evolution:
 	swift build \
 		-q \

diff --git a/Tests/ComposableArchitectureTests/EffectRunTests.swift b/Tests/ComposableArchitectureTests/EffectRunTests.swift
@@ -124,7 +124,7 @@ final class EffectRunTests: BaseTCATestCase {
   }
 
   @MainActor
-  func testRunEscapeFailure() async {
+  func testRunEscapeFailure() async throws {
     XCTExpectFailure {
       $0.compactDescription == """
         failed - An action was sent from a completed effect:
@@ -163,8 +163,9 @@ final class EffectRunTests: BaseTCATestCase {
       }
     }
 
-    let viewStore = ViewStore(store, observe: { $0 })
-    await viewStore.send(.tap).finish()
+    await store.send(.tap).finish()
     await queue.advance(by: .seconds(1))
+
+    try await Task.sleep(nanoseconds: 100_000_000)
   }
 }