From 1a3fc4ba75c3bf8fbcb70dbdc85d62d7eef153ff Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 12:41:02 -0600 Subject: [PATCH 1/6] test: Use swift-nio main branch for testing out ci changes. --- Package.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 23398ea..fcc0b11 100644 --- a/Package.swift +++ b/Package.swift @@ -16,11 +16,9 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"), - // NOTE: Compiling to wasm requires specific versions of swift-nio. - // This older version is left as-is to avoid placing restrictions - // on other targets. But to compile for wasm, make sure you have - // a version of swift-nio with a passing build for the NIOCore module. - .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0"), + // TODO: SM: Require a minimum swift-nio version once latest nio core fixes are versionized. + // .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0.TBD"), + .package(url: "https://github.com/apple/swift-nio.git", branch: "main"), ], targets: [ .target( From 5eb3fe74ce96f67850261d46ec84930b69e20a88 Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 13:19:05 -0600 Subject: [PATCH 2/6] experiment: Adds wasm build to CI. --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9e6713b..ff27742 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,7 @@ jobs: secrets: inherit with: with_android: true + with_wasm: true pure-fluent-integration-test: if: ${{ !(github.event.pull_request.draft || false) }} From dbfd37292db5336f4f7cf6b95d165d9584fa7ae5 Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 13:24:19 -0600 Subject: [PATCH 3/6] test: Use unmerged CI workflow. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff27742..11d9184 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ env: jobs: unit-tests: - uses: vapor/ci/.github/workflows/run-unit-tests.yml@main + uses: passivelogic/vapor-ci/.github/workflows/run-unit-tests.yml@feat/add-swift-wasm-ci secrets: inherit with: with_android: true From 0bb6e529862307dc220bca41e4dac9ce23abade6 Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 13:40:34 -0600 Subject: [PATCH 4/6] test: Forcing a new CI build. --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fcc0b11..74acc69 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"), - // TODO: SM: Require a minimum swift-nio version once latest nio core fixes are versionized. + // TODO: Require a minimum swift-nio version once latest nio core fixes are versionized. // .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0.TBD"), .package(url: "https://github.com/apple/swift-nio.git", branch: "main"), ], From 65da7e4fc367586955a4ba8012b0b3c42a0ffeb4 Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 14:01:16 -0600 Subject: [PATCH 5/6] test: forcing another CI build. --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 74acc69..bc8ff5f 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"), - // TODO: Require a minimum swift-nio version once latest nio core fixes are versionized. + // TODO: sm: Require a minimum swift-nio version once latest nio core fixes are versionized. // .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0.TBD"), .package(url: "https://github.com/apple/swift-nio.git", branch: "main"), ], From 9bc50e6c42ad5051029955251ddc069873896cf5 Mon Sep 17 00:00:00 2001 From: Scott Marchant Date: Wed, 25 Jun 2025 14:08:40 -0600 Subject: [PATCH 6/6] test: force another CI build. --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index bc8ff5f..74acc69 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"), - // TODO: sm: Require a minimum swift-nio version once latest nio core fixes are versionized. + // TODO: Require a minimum swift-nio version once latest nio core fixes are versionized. // .package(url: "https://github.com/apple/swift-nio.git", from: "2.65.0.TBD"), .package(url: "https://github.com/apple/swift-nio.git", branch: "main"), ],