From 7539f366206c7780b9bb7e71bdc0087b24314b10 Mon Sep 17 00:00:00 2001 From: Yim Lee Date: Wed, 12 Apr 2023 14:44:22 -0700 Subject: [PATCH 1/2] Add docker-compose file for Swift 5.9 --- docker/docker-compose.2204.58.yaml | 3 ++- docker/docker-compose.2204.59.yaml | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 docker/docker-compose.2204.59.yaml diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml index 0922f83..b69e3ab 100644 --- a/docker/docker-compose.2204.58.yaml +++ b/docker/docker-compose.2204.58.yaml @@ -6,7 +6,8 @@ services: image: swift-nio-ssh:22.04-5.8 build: args: - base_image: "swiftlang/swift:nightly-5.8-jammy" + ubuntu_version: "jammy" + swift_version: "5.8" documentation-check: image: swift-nio-ssh:22.04-5.8 diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml new file mode 100644 index 0000000..0924221 --- /dev/null +++ b/docker/docker-compose.2204.59.yaml @@ -0,0 +1,25 @@ +version: "3" + +services: + + runtime-setup: + image: swift-nio-ssh:22.04-5.9 + build: + args: + base_image: "swiftlang/swift:nightly-5.9-jammy" + + documentation-check: + image: swift-nio-ssh:22.04-5.9 + + test: + image: swift-nio-ssh:22.04-5.9 + environment: + - MAX_ALLOCS_ALLOWED_client_server_many_small_commands_per_connection=217800 + - MAX_ALLOCS_ALLOWED_client_server_one_command_per_connection=995050 + - MAX_ALLOCS_ALLOWED_client_server_streaming_large_message_in_small_chunks=49000 + - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error + #- SANITIZER_ARG=--sanitize=thread + - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors + + shell: + image: swift-nio-ssh:22.04-5.9 From 6ea3a7207821b327edf4d5eaa5a9112afc834f52 Mon Sep 17 00:00:00 2001 From: Yim Lee Date: Thu, 13 Apr 2023 08:55:04 -0700 Subject: [PATCH 2/2] Use allocation counts from main not 5.8 --- docker/docker-compose.2204.59.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml index 0924221..6fca83e 100644 --- a/docker/docker-compose.2204.59.yaml +++ b/docker/docker-compose.2204.59.yaml @@ -14,12 +14,11 @@ services: test: image: swift-nio-ssh:22.04-5.9 environment: - - MAX_ALLOCS_ALLOWED_client_server_many_small_commands_per_connection=217800 - - MAX_ALLOCS_ALLOWED_client_server_one_command_per_connection=995050 - - MAX_ALLOCS_ALLOWED_client_server_streaming_large_message_in_small_chunks=49000 + - MAX_ALLOCS_ALLOWED_client_server_many_small_commands_per_connection=223800 + - MAX_ALLOCS_ALLOWED_client_server_one_command_per_connection=1005050 + - MAX_ALLOCS_ALLOWED_client_server_streaming_large_message_in_small_chunks=51000 - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error #- SANITIZER_ARG=--sanitize=thread - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors - shell: image: swift-nio-ssh:22.04-5.9