From 15f595384a51e51d710760aae8a2267f32a9becd Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 09:18:07 +0100 Subject: [PATCH 1/6] Disable warnings as errors on Swift 6 and main Motivation: The Swift 6 compiler emits a number of warnings about sendability which we haven't dealt with yet. The CI failing on warnings may mask other compilation issues or test failures. Modifications: - Disable warnings as errors on Swift 6 and main Result: Swift 6 and main CI should pass --- .github/workflows/pull_request.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5acac0de03..bc3c42abf8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -3,7 +3,7 @@ name: Pull Request on: pull_request: types: [opened, reopened, synchronize, ready_for_review] - + jobs: call-pull-request-soundness-workflow: name: Soundness @@ -18,6 +18,9 @@ jobs: with: name: "Unit tests" matrix_linux_command: "swift test -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" + # Disable warnings as errors: Swift 6 emits sendability warnings that haven't been dealt with yet. + matrix_linux_nightly_main_command_override: "swift test --explicit-target-dependency-import-check error" + matrix_linux_nightly_6_0_command_override: "swift test --explicit-target-dependency-import-check error" call-pull-request-benchmark-workflow: name: Benchmarks From c69c0216d2d1ed571dab712ac9c522548623cd86 Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 09:31:05 +0100 Subject: [PATCH 2/6] Dont rerun CI when marked as ready for review --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bc3c42abf8..568f12a6db 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,7 +2,7 @@ name: Pull Request on: pull_request: - types: [opened, reopened, synchronize, ready_for_review] + types: [opened, reopened, synchronize] jobs: call-pull-request-soundness-workflow: From 82fdc03ecdcfc135f2144a24d6c211b055adcec8 Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 09:53:55 +0100 Subject: [PATCH 3/6] Update limits --- .../Thresholds/nightly-6.0.json | 18 ++-- .../Thresholds/nightly-main.json | 99 ++++++++++--------- 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json index b3d660a648..bf7b6b8169 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json @@ -1,8 +1,8 @@ { - "10000000_asyncsequenceproducer": 21, + "10000000_asyncsequenceproducer": 19, "1000000_asyncwriter": 1000050, - "1000_addHandlers": 45050, - "1000_addHandlers_sync": 38050, + "1000_addHandlers": 44050, + "1000_addHandlers_sync": 37050, "1000_addRemoveHandlers_handlercontext": 8050, "1000_addRemoveHandlers_handlername": 8050, "1000_addRemoveHandlers_handlertype": 8050, @@ -11,15 +11,15 @@ "1000_copying_bytebufferview_to_array": 1050, "1000_copying_circularbuffer_to_array": 1050, "1000_getHandlers": 8050, - "1000_getHandlers_sync": 36, + "1000_getHandlers_sync": 35, "1000_reqs_1_conn": 26400, - "1000_rst_connections": 147000, + "1000_rst_connections": 145000, "1000_tcpbootstraps": 3050, - "1000_tcpconnections": 155050, + "1000_tcpconnections": 152050, "1000_udp_reqs": 6050, "1000_udpbootstraps": 2050, - "1000_udpconnections": 76050, - "1_reqs_1000_conn": 393000, + "1000_udpconnections": 75050, + "1_reqs_1000_conn": 389050, "bytebuffer_lots_of_rw": 2050, "creating_10000_headers": 0, "decode_1000_ws_frames": 2050, @@ -48,4 +48,4 @@ "udp_1000_reqs_1_conn": 6200, "udp_1_reqs_1000_conn": 165050 } - \ No newline at end of file + diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json index 5792388db3..bf7b6b8169 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json @@ -1,50 +1,51 @@ { - "10000000_asyncsequenceproducer": 21, - "1000000_asyncwriter": 1000050, - "1000_addHandlers": 45050, - "1000_addHandlers_sync": 38050, - "1000_addRemoveHandlers_handlercontext": 8050, - "1000_addRemoveHandlers_handlername": 8050, - "1000_addRemoveHandlers_handlertype": 8050, - "1000_autoReadGetAndSet": 18050, - "1000_autoReadGetAndSet_sync": 0, - "1000_copying_bytebufferview_to_array": 1050, - "1000_copying_circularbuffer_to_array": 1050, - "1000_getHandlers": 8050, - "1000_getHandlers_sync": 36, - "1000_reqs_1_conn": 26400, - "1000_rst_connections": 147000, - "1000_tcpbootstraps": 3050, - "1000_tcpconnections": 155050, - "1000_udp_reqs": 6050, - "1000_udpbootstraps": 2050, - "1000_udpconnections": 76050, - "1_reqs_1000_conn": 393000, - "bytebuffer_lots_of_rw": 2050, - "creating_10000_headers": 0, - "decode_1000_ws_frames": 2050, - "encode_1000_ws_frames_holding_buffer": 3, - "encode_1000_ws_frames_holding_buffer_with_mask": 2050, - "encode_1000_ws_frames_holding_buffer_with_space": 3, - "encode_1000_ws_frames_holding_buffer_with_space_with_mask": 2050, - "encode_1000_ws_frames_new_buffer": 3050, - "encode_1000_ws_frames_new_buffer_with_mask": 5050, - "encode_1000_ws_frames_new_buffer_with_space": 3050, - "encode_1000_ws_frames_new_buffer_with_space_with_mask": 5050, - "execute_hop_10000_tasks": 0, - "future_erase_result": 4050, - "future_lots_of_callbacks": 53050, - "get_100000_headers_canonical_form": 700050, - "get_100000_headers_canonical_form_trimming_whitespace": 700050, - "get_100000_headers_canonical_form_trimming_whitespace_from_long_string": 700050, - "get_100000_headers_canonical_form_trimming_whitespace_from_short_string": 700050, - "modifying_1000_circular_buffer_elements": 0, - "modifying_byte_buffer_view": 6050, - "ping_pong_1000_reqs_1_conn": 343, - "read_10000_chunks_from_file": 110200, - "schedule_10000_tasks": 50100, - "schedule_and_run_10000_tasks": 50050, - "scheduling_10000_executions": 89, - "udp_1000_reqs_1_conn": 6200, - "udp_1_reqs_1000_conn": 165050 -} + "10000000_asyncsequenceproducer": 19, + "1000000_asyncwriter": 1000050, + "1000_addHandlers": 44050, + "1000_addHandlers_sync": 37050, + "1000_addRemoveHandlers_handlercontext": 8050, + "1000_addRemoveHandlers_handlername": 8050, + "1000_addRemoveHandlers_handlertype": 8050, + "1000_autoReadGetAndSet": 18050, + "1000_autoReadGetAndSet_sync": 0, + "1000_copying_bytebufferview_to_array": 1050, + "1000_copying_circularbuffer_to_array": 1050, + "1000_getHandlers": 8050, + "1000_getHandlers_sync": 35, + "1000_reqs_1_conn": 26400, + "1000_rst_connections": 145000, + "1000_tcpbootstraps": 3050, + "1000_tcpconnections": 152050, + "1000_udp_reqs": 6050, + "1000_udpbootstraps": 2050, + "1000_udpconnections": 75050, + "1_reqs_1000_conn": 389050, + "bytebuffer_lots_of_rw": 2050, + "creating_10000_headers": 0, + "decode_1000_ws_frames": 2050, + "encode_1000_ws_frames_holding_buffer": 3, + "encode_1000_ws_frames_holding_buffer_with_mask": 2050, + "encode_1000_ws_frames_holding_buffer_with_space": 3, + "encode_1000_ws_frames_holding_buffer_with_space_with_mask": 2050, + "encode_1000_ws_frames_new_buffer": 3050, + "encode_1000_ws_frames_new_buffer_with_mask": 5050, + "encode_1000_ws_frames_new_buffer_with_space": 3050, + "encode_1000_ws_frames_new_buffer_with_space_with_mask": 5050, + "execute_hop_10000_tasks": 0, + "future_erase_result": 4050, + "future_lots_of_callbacks": 53050, + "get_100000_headers_canonical_form": 700050, + "get_100000_headers_canonical_form_trimming_whitespace": 700050, + "get_100000_headers_canonical_form_trimming_whitespace_from_long_string": 700050, + "get_100000_headers_canonical_form_trimming_whitespace_from_short_string": 700050, + "modifying_1000_circular_buffer_elements": 0, + "modifying_byte_buffer_view": 6050, + "ping_pong_1000_reqs_1_conn": 343, + "read_10000_chunks_from_file": 110200, + "schedule_10000_tasks": 50100, + "schedule_and_run_10000_tasks": 50050, + "scheduling_10000_executions": 89, + "udp_1000_reqs_1_conn": 6200, + "udp_1_reqs_1000_conn": 165050 + } + From 4d7e4e19af37d67a77dd2bf804a21cf9326e2f77 Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 10:21:39 +0100 Subject: [PATCH 4/6] add some slack --- .../tests_04_performance/Thresholds/nightly-6.0.json | 5 ++--- .../tests_04_performance/Thresholds/nightly-main.json | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json index bf7b6b8169..e68dfc8060 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json @@ -13,7 +13,7 @@ "1000_getHandlers": 8050, "1000_getHandlers_sync": 35, "1000_reqs_1_conn": 26400, - "1000_rst_connections": 145000, + "1000_rst_connections": 145050, "1000_tcpbootstraps": 3050, "1000_tcpconnections": 152050, "1000_udp_reqs": 6050, @@ -47,5 +47,4 @@ "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, "udp_1_reqs_1000_conn": 165050 - } - +} diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json index bf7b6b8169..e68dfc8060 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json @@ -13,7 +13,7 @@ "1000_getHandlers": 8050, "1000_getHandlers_sync": 35, "1000_reqs_1_conn": 26400, - "1000_rst_connections": 145000, + "1000_rst_connections": 145050, "1000_tcpbootstraps": 3050, "1000_tcpconnections": 152050, "1000_udp_reqs": 6050, @@ -47,5 +47,4 @@ "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, "udp_1_reqs_1000_conn": 165050 - } - +} From 1b1bda83e962961ffca6a50fe22029bafe530318 Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 10:48:10 +0100 Subject: [PATCH 5/6] more fixes --- .../tests_04_performance/Thresholds/nightly-6.0.json | 2 +- .../tests_04_performance/Thresholds/nightly-main.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json index e68dfc8060..8a17ce7543 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json @@ -42,7 +42,7 @@ "modifying_byte_buffer_view": 6050, "ping_pong_1000_reqs_1_conn": 343, "read_10000_chunks_from_file": 110200, - "schedule_10000_tasks": 50100, + "schedule_10000_tasks": 40100, "schedule_and_run_10000_tasks": 50050, "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json index e68dfc8060..8a17ce7543 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json @@ -42,7 +42,7 @@ "modifying_byte_buffer_view": 6050, "ping_pong_1000_reqs_1_conn": 343, "read_10000_chunks_from_file": 110200, - "schedule_10000_tasks": 50100, + "schedule_10000_tasks": 40100, "schedule_and_run_10000_tasks": 50050, "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, From a7e5ef8eda2de4019911e77eb46aefdd17cffacf Mon Sep 17 00:00:00 2001 From: George Barnett Date: Thu, 18 Jul 2024 11:43:39 +0100 Subject: [PATCH 6/6] fixup --- .../tests_04_performance/Thresholds/nightly-6.0.json | 2 +- .../tests_04_performance/Thresholds/nightly-main.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json index 8a17ce7543..32f5d6112d 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-6.0.json @@ -46,5 +46,5 @@ "schedule_and_run_10000_tasks": 50050, "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, - "udp_1_reqs_1000_conn": 165050 + "udp_1_reqs_1000_conn": 162050 } diff --git a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json index 8a17ce7543..32f5d6112d 100644 --- a/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json +++ b/IntegrationTests/tests_04_performance/Thresholds/nightly-main.json @@ -46,5 +46,5 @@ "schedule_and_run_10000_tasks": 50050, "scheduling_10000_executions": 89, "udp_1000_reqs_1_conn": 6200, - "udp_1_reqs_1000_conn": 165050 + "udp_1_reqs_1000_conn": 162050 }