Merge pull request #3663 from SwiftPackageIndex/issue-3655-swift-testing-part-2

Issue 3655 swift testing part 2

Author: finestructure

.github/workflows/ci.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Install unzip
         run: apt-get update && apt-get install -y unzip
       - name: Run tests
-        run: cp .env.testing.template .env.testing && make test
+        run: cp .env.testing.template .env.testing && make test-plain
         env:
           COLLECTION_SIGNING_PRIVATE_KEY: ${{ secrets.COLLECTION_SIGNING_PRIVATE_KEY }}
           DATABASE_HOST: postgres

Makefile

@@ -33,6 +33,9 @@ build:
 run:
 	swift run
 
+test-plain:
+	swift test --disable-automatic-resolution --sanitize=thread --no-parallel
+
 test: xcbeautify
 	set -o pipefail \
 	&& swift test --disable-automatic-resolution --sanitize=thread \

Sources/App/Commands/Analyze.swift

@@ -180,7 +180,7 @@ extension Analyze {
         // 2024-10-05 sas: We need to explicitly weave dependencies into the `transaction` closure, because escaping closures strip them.
         // https://github.com/pointfreeco/swift-dependencies/discussions/283#discussioncomment-10846172
         // This might not be needed in Vapor 5 / FluentKit 2
-        // TODO: verify this is still needed once we upgrade to Vapor 5 / FluentKit 2
+        // TODO: verify if this is still needed once we upgrade to Vapor 5 / FluentKit 2
         try await withEscapedDependencies { dependencies in
             try await database.transaction { tx in
                 try await dependencies.yield {