From 1bc0c332e4ede49a7ca07ee220830152dca50751 Mon Sep 17 00:00:00 2001 From: Mia Koring Date: Tue, 13 Oct 2026 01:42:58 +0200 Subject: [PATCH 1/3] update linux ci --- .github/workflows/swift-test-all-release.yml | 4 ++-- .github/workflows/swift-test-linux.yml | 2 +- .github/workflows/swift-test-mac.yml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift-test-all-release.yml b/.github/workflows/swift-test-all-release.yml index e8a8deb..accf419 100644 --- a/.github/workflows/swift-test-all-release.yml +++ b/.github/workflows/swift-test-all-release.yml @@ -14,7 +14,7 @@ jobs: with: persist-credentials: false - name: Test - run: swift test -Xswiftc -Xfrontend -Xswiftc -enable-cross-import-overlays -Xswiftc -target -Xswiftc arm64-apple-macosx15.0 -c release + run: swift test -c release linux: runs-on: blacksmith-4vcpu-ubuntu-2404 container: @@ -25,4 +25,4 @@ jobs: with: persist-credentials: false - name: Test - run: ./Scripts/test-release.sh + run: swift test -c release diff --git a/.github/workflows/swift-test-linux.yml b/.github/workflows/swift-test-linux.yml index df42188..0ad448c 100644 --- a/.github/workflows/swift-test-linux.yml +++ b/.github/workflows/swift-test-linux.yml @@ -21,4 +21,4 @@ jobs: with: persist-credentials: false - name: Test - run: ./Scripts/test.sh \ No newline at end of file + run: swift test \ No newline at end of file diff --git a/.github/workflows/swift-test-mac.yml b/.github/workflows/swift-test-mac.yml index 935fe52..a938812 100644 --- a/.github/workflows/swift-test-mac.yml +++ b/.github/workflows/swift-test-mac.yml @@ -18,4 +18,5 @@ jobs: with: persist-credentials: false - name: Run tests - run: swift test -Xswiftc -Xfrontend -Xswiftc -enable-cross-import-overlays -Xswiftc -target -Xswiftc arm64-apple-macosx15.0 + run: swift test + From 917ca8a8e0f3981b76696594a1d3434ff99a22ff Mon Sep 17 00:00:00 2001 From: Mia Koring Date: Tue, 13 Oct 2026 01:59:40 +0200 Subject: [PATCH 2/3] try removing package.resolved --- Package.resolved | 267 ----------------------------------------------- 1 file changed, 267 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 2151a92..0000000 --- a/Package.resolved +++ /dev/null @@ -1,267 +0,0 @@ -{ - "originHash" : "ea982afa92406dea5fbdac00159b44203da33b75ab4e8652174a962da585fc64", - "pins" : [ - { - "identity" : "async-http-client", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swift-server/async-http-client.git", - "state" : { - "revision" : "4c005f955e83f888d5616e579717a36d2dfc6301", - "version" : "1.36.2" - } - }, - { - "identity" : "hummingbird", - "kind" : "remoteSourceControl", - "location" : "https://github.com/hummingbird-project/hummingbird.git", - "state" : { - "revision" : "f2a7f918ac422cbac049c4b5169c59b9d5a778a1", - "version" : "2.27.1" - } - }, - { - "identity" : "swift-algorithms", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-algorithms.git", - "state" : { - "revision" : "87e50f483c54e6efd60e885f7f5aa946cee68023", - "version" : "1.2.1" - } - }, - { - "identity" : "swift-asn1", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-asn1.git", - "state" : { - "revision" : "3b6410f7dee09eb33cdd26260c5fd47fda19b0e2", - "version" : "1.7.3" - } - }, - { - "identity" : "swift-async-algorithms", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-async-algorithms.git", - "state" : { - "revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0", - "version" : "1.1.7" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "0442cb5a3f98ab802acb777929fdb446bda11a34", - "version" : "1.3.1" - } - }, - { - "identity" : "swift-certificates", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-certificates.git", - "state" : { - "revision" : "ff86b924ead66f853b8baf91f3c41926a8f36177", - "version" : "1.21.0" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections", - "state" : { - "revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c", - "version" : "1.7.3" - } - }, - { - "identity" : "swift-configuration", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-configuration.git", - "state" : { - "revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42", - "version" : "1.2.2" - } - }, - { - "identity" : "swift-crypto", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-crypto.git", - "state" : { - "revision" : "1c80d3aff53fedc445b60692980cb4f19a618657", - "version" : "5.0.1" - } - }, - { - "identity" : "swift-custom-dump", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-custom-dump", - "state" : { - "revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19", - "version" : "1.7.3" - } - }, - { - "identity" : "swift-distributed-tracing", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-distributed-tracing.git", - "state" : { - "revision" : "117c46edcc9e7a9a26a539d30044b2275d9c9ab7", - "version" : "1.6.0" - } - }, - { - "identity" : "swift-http-structured-headers", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-structured-headers.git", - "state" : { - "revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47", - "version" : "1.7.0" - } - }, - { - "identity" : "swift-http-types", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-types.git", - "state" : { - "revision" : "bff4b6903cdc99dda49649dd52f46c11cfd3ed50", - "version" : "1.8.0" - } - }, - { - "identity" : "swift-issue-reporting", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-issue-reporting", - "state" : { - "revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f", - "version" : "2.1.1" - } - }, - { - "identity" : "swift-log", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", - "state" : { - "revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597", - "version" : "1.16.1" - } - }, - { - "identity" : "swift-macro-testing", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-macro-testing.git", - "state" : { - "revision" : "0b6bd11ea72e07eec539f2f000efad0b363a90cc", - "version" : "0.7.0" - } - }, - { - "identity" : "swift-metrics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-metrics.git", - "state" : { - "revision" : "9467f9cc3c32b4386fad1ecc4618328887ef5758", - "version" : "2.12.0" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa", - "version" : "2.104.0" - } - }, - { - "identity" : "swift-nio-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-extras.git", - "state" : { - "revision" : "41449336c8ecfadac6b4b5be75f9c3c306e61ced", - "version" : "1.35.1" - } - }, - { - "identity" : "swift-nio-http2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-http2.git", - "state" : { - "revision" : "0f3e54e29c944c2e835ad52159da7d9e1c94ac69", - "version" : "1.46.0" - } - }, - { - "identity" : "swift-nio-ssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-ssl.git", - "state" : { - "revision" : "322f3c2a4a21df31c84ca416bf65ee5e9059e440", - "version" : "2.37.5" - } - }, - { - "identity" : "swift-nio-transport-services", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-transport-services.git", - "state" : { - "revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5", - "version" : "1.28.0" - } - }, - { - "identity" : "swift-numerics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-numerics.git", - "state" : { - "revision" : "0c0290ff6b24942dadb83a929ffaaa1481df04a2", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-service-context", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-service-context.git", - "state" : { - "revision" : "d93beaa2b2c585cb9be08b070e46dda9e2d203be", - "version" : "1.4.0" - } - }, - { - "identity" : "swift-service-lifecycle", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swift-server/swift-service-lifecycle.git", - "state" : { - "revision" : "c55297914e26ce3085b73ca88c521ef99136f6ad", - "version" : "2.12.1" - } - }, - { - "identity" : "swift-snapshot-testing", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-snapshot-testing", - "state" : { - "revision" : "28e5de025e3fd98991791bfbf83023ab3708da03", - "version" : "1.19.6" - } - }, - { - "identity" : "swift-syntax", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swiftlang/swift-syntax.git", - "state" : { - "revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf", - "version" : "604.0.0" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system", - "state" : { - "revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750", - "version" : "1.8.1" - } - } - ], - "version" : 3 -} From 07072c199480f3b2a54a78910602e0f1f36dec72 Mon Sep 17 00:00:00 2001 From: Mia Koring Date: Tue, 13 Oct 2026 02:06:23 +0200 Subject: [PATCH 3/3] try depending on service context --- Package.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index e3703eb..b0c4daa 100644 --- a/Package.swift +++ b/Package.swift @@ -23,6 +23,7 @@ let package = Package( from: "1.0.2", traits: [] ), + .package(url: "https://github.com/apple/swift-service-context.git", from: "1.0.0"), ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. @@ -31,6 +32,7 @@ let package = Package( name: "Nectar", dependencies: [ .product(name: "Hummingbird", package: "hummingbird"), + .product(name: "ServiceContextModule", package: "swift-service-context"), "NectarMacros" ], swiftSettings: [