Skip to content

CI: enable subdirectory package manifest discovery #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lukasa merged 2 commits into from
Oct 31, 2025
Merged

CI: enable subdirectory package manifest discovery #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d7c30
CI: enable subdirectory package manifest discovery
rnro Oct 31, 2025
fb82bf4
increase json-rpc to Swift 6.0
rnro Oct 31, 2025
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: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
run: echo "build-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
env:
MATRIX_LINUX_COMMAND: STRICT_CONCURRENCY=true SWIFT_PACKAGE_DIRECTORIES='TLSify UniversalBootstrapDemo http-responsiveness-server connect-proxy http2-client http2-server json-rpc nio-launchd' dev/build_all.sh && SWIFT_PACKAGE_DIRECTORIES='backpressure-file-io-channel' dev/build_all.sh
FIND_SUBDIRECTORY_MANIFESTS_ENABLED: true

build-tests:
name: Builds
Expand All @@ -55,6 +56,7 @@ jobs:
run: echo "build-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
env:
MATRIX_LINUX_COMMAND: EXTRA_BUILD_FLAGS='-c release' SWIFT_PACKAGE_DIRECTORIES='TLSify UniversalBootstrapDemo http-responsiveness-server connect-proxy http2-client http2-server json-rpc nio-launchd' dev/build_all.sh && SWIFT_PACKAGE_DIRECTORIES='backpressure-file-io-channel' dev/build_all.sh
FIND_SUBDIRECTORY_MANIFESTS_ENABLED: true

release-build-tests:
name: Release build tests
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
run: echo "build-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
env:
MATRIX_LINUX_COMMAND: STRICT_CONCURRENCY=true SWIFT_PACKAGE_DIRECTORIES='TLSify UniversalBootstrapDemo http-responsiveness-server connect-proxy http2-client http2-server json-rpc nio-launchd' dev/build_all.sh && SWIFT_PACKAGE_DIRECTORIES='backpressure-file-io-channel' dev/build_all.sh
FIND_SUBDIRECTORY_MANIFESTS_ENABLED: true

build-tests:
name: Build tests
Expand All @@ -53,6 +54,7 @@ jobs:
run: echo "build-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
env:
MATRIX_LINUX_COMMAND: EXTRA_BUILD_FLAGS='-c release' SWIFT_PACKAGE_DIRECTORIES='TLSify UniversalBootstrapDemo http-responsiveness-server connect-proxy http2-client http2-server json-rpc nio-launchd' dev/build_all.sh && SWIFT_PACKAGE_DIRECTORIES='backpressure-file-io-channel' dev/build_all.sh
FIND_SUBDIRECTORY_MANIFESTS_ENABLED: true

release-build-tests:
name: Release build tests
Expand Down
22 changes: 6 additions & 16 deletions json-rpc/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:6.0
//===----------------------------------------------------------------------===//
//
// This source file is part of the SwiftNIO open source project
Expand All @@ -17,17 +17,7 @@ import PackageDescription

let strictConcurrencyDevelopment = false

let strictConcurrencySettings: [SwiftSetting] = {
var initialSettings: [SwiftSetting] = []

if strictConcurrencyDevelopment {
// -warnings-as-errors here is a workaround so that IDE-based development can
// get tripped up on -require-explicit-sendable.
initialSettings.append(.unsafeFlags(["-Xfrontend", "-require-explicit-sendable", "-warnings-as-errors"]))
}

return initialSettings
}()
let swiftSettings: [SwiftSetting] = []

let package = Package(
name: "swift-json-rpc",
Expand Down Expand Up @@ -58,21 +48,21 @@ let package = Package(
dependencies: [
"JSONRPC"
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.executableTarget(
name: "ClientExample",
dependencies: [
"JSONRPC"
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.executableTarget(
name: "LightsdDemo",
dependencies: [
"JSONRPC"
],
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
.testTarget(
name: "JSONRPCTests",
Expand All @@ -82,7 +72,7 @@ let package = Package(
.product(name: "NIOPosix", package: "swift-nio"),
],
path: "Tests/JsonRpcTests",
swiftSettings: strictConcurrencySettings
swiftSettings: swiftSettings
),
]
)