From b23f40b4fa2d5220e37da55f24dfaae9df39187e Mon Sep 17 00:00:00 2001 From: Johannes Weiss Date: Tue, 1 Jun 2021 18:58:56 +0100 Subject: [PATCH] add Swift 5.5 job (#1845) --- Sources/NIOAsyncAwaitDemo/main.swift | 2 +- .../_NIOConcurrency/AsyncAwaitSupport.swift | 2 +- ...te-alloc-limits-to-last-completed-ci-build | 2 +- docker/docker-compose.2004.55.yaml | 66 +++++++++++++++++++ 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 docker/docker-compose.2004.55.yaml diff --git a/Sources/NIOAsyncAwaitDemo/main.swift b/Sources/NIOAsyncAwaitDemo/main.swift index d46a0d0334..3c1a831264 100644 --- a/Sources/NIOAsyncAwaitDemo/main.swift +++ b/Sources/NIOAsyncAwaitDemo/main.swift @@ -66,7 +66,7 @@ func main() async { let dg = DispatchGroup() dg.enter() if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) { - Task.detached { + Task { await main() dg.leave() } diff --git a/Sources/_NIOConcurrency/AsyncAwaitSupport.swift b/Sources/_NIOConcurrency/AsyncAwaitSupport.swift index 3b66fe53e8..15cbd109d6 100644 --- a/Sources/_NIOConcurrency/AsyncAwaitSupport.swift +++ b/Sources/_NIOConcurrency/AsyncAwaitSupport.swift @@ -47,7 +47,7 @@ extension EventLoopPromise { /// - parameters: /// - body: The `async` function to run. public func completeWithAsync(_ body: @escaping () async throws -> Value) { - Task.detached { + Task { do { let value = try await body() self.succeed(value) diff --git a/dev/update-alloc-limits-to-last-completed-ci-build b/dev/update-alloc-limits-to-last-completed-ci-build index 1329a6ae83..8f4dec5150 100755 --- a/dev/update-alloc-limits-to-last-completed-ci-build +++ b/dev/update-alloc-limits-to-last-completed-ci-build @@ -22,7 +22,7 @@ url_prefix=${1-"https://ci.swiftserver.group/job/swift-nio2-swift"} target_repo=${2-"$here/.."} tmpdir=$(mktemp -d /tmp/.last-build_XXXXXX) -for f in 51 52 53 54 -nightly; do +for f in 51 52 53 54 55 -nightly; do echo "swift$f" url="$url_prefix$f-prb/lastCompletedBuild/consoleFull" echo "$url" diff --git a/docker/docker-compose.2004.55.yaml b/docker/docker-compose.2004.55.yaml new file mode 100644 index 0000000000..0b9fe14f9d --- /dev/null +++ b/docker/docker-compose.2004.55.yaml @@ -0,0 +1,66 @@ +version: "3" + +services: + + runtime-setup: + image: swift-nio:20.04-5.5 + build: + args: + base_image: "swiftlang/swift:nightly-5.5-focal" + ubuntu_version: "focal" + + unit-tests: + image: swift-nio:20.04-5.5 + + integration-tests: + image: swift-nio:20.04-5.5 + + test: + image: swift-nio:20.04-5.5 + environment: + - MAX_ALLOCS_ALLOWED_1000_addHandlers=47050 + - MAX_ALLOCS_ALLOWED_1000_addHandlers_sync=40050 + - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlercontext=9050 + - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlername=9050 + - MAX_ALLOCS_ALLOWED_1000_addRemoveHandlers_handlertype=9050 + - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet=29050 + - MAX_ALLOCS_ALLOWED_1000_autoReadGetAndSet_sync=0 + - MAX_ALLOCS_ALLOWED_1000_getHandlers=9050 + - MAX_ALLOCS_ALLOWED_1000_getHandlers_sync=37 + - MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=30450 + - MAX_ALLOCS_ALLOWED_1000_tcpbootstraps=4050 + - MAX_ALLOCS_ALLOWED_1000_tcpconnections=172050 + - MAX_ALLOCS_ALLOWED_1000_udp_reqs=12050 + - MAX_ALLOCS_ALLOWED_1000_udpbootstraps=2050 + - MAX_ALLOCS_ALLOWED_1000_udpconnections=96050 + - MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=453000 + - MAX_ALLOCS_ALLOWED_bytebuffer_lots_of_rw=2050 + - MAX_ALLOCS_ALLOWED_creating_10000_headers=0 + - MAX_ALLOCS_ALLOWED_decode_1000_ws_frames=2050 + - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer=3 + - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_holding_buffer_with_space=3 + - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer=3050 + - MAX_ALLOCS_ALLOWED_encode_1000_ws_frames_new_buffer_with_space=3050 + - MAX_ALLOCS_ALLOWED_future_lots_of_callbacks=60050 + - MAX_ALLOCS_ALLOWED_modifying_1000_circular_buffer_elements=0 + - MAX_ALLOCS_ALLOWED_modifying_byte_buffer_view=2050 + - MAX_ALLOCS_ALLOWED_ping_pong_1000_reqs_1_conn=4400 + - MAX_ALLOCS_ALLOWED_read_10000_chunks_from_file=190050 + - MAX_ALLOCS_ALLOWED_schedule_10000_tasks=90050 + - MAX_ALLOCS_ALLOWED_scheduling_10000_executions=20150 + - MAX_ALLOCS_ALLOWED_udp_1000_reqs_1_conn=12200 + - MAX_ALLOCS_ALLOWED_udp_1_reqs_1000_conn=190050 + # - SANITIZER_ARG=--sanitize=thread # TSan broken still + - SWIFT_TEST_VERB=build # WARNING: THIS DISABLES ALL TESTS. Please remove (workaround https://bugs.swift.org/browse/SR-14268) + + performance-test: + image: swift-nio:20.04-5.5 + + shell: + image: swift-nio:20.04-5.5 + + echo: + image: swift-nio:20.04-5.5 + + http: + image: swift-nio:20.04-5.5