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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Sources/App/Commands/Analyze.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading