From 3d1ee9d45a897da69008e988bf6389dc4728dc8a Mon Sep 17 00:00:00 2001 From: Gus Cairo Date: Wed, 30 Sep 2026 10:05:07 +0100 Subject: [PATCH] Add and enable 6.4 workflows (#3750) ### Motivation * Swift 6.4 has been released, so we should add it to our CI coverage. ### Modifications * Update `apple/swift-nio/scripts/generate_matrix.sh` * Update `apple/swift-nio/scripts/check-matrix-job.sh` * Update reusable adopters of `swift_test_matrix.yml` * Update end-user adopter workflows of `swift_test_matrix.yml` * Add Swift 6.4 inputs to `macos_tests.yml` and `macos_benchmarks.yml` * Add a 6.4 release job to `wasm_swift_sdk.yml` * Enable the Windows 6.4 unit test job in `main.yml` and `pull_request.yml` * Copy benchmark thresholds from 6.3 ### Result * NIO runs Swift 6.4 CI, and downstream repositories can opt-in. --- - Successful run (minus broken nightlies): https://github.com/apple/swift-nio/actions/runs/36403423635?pr=3750 --- .github/workflows/benchmarks.yml | 9 +++ .github/workflows/cxx_interop.yml | 9 +++ .github/workflows/macos_benchmarks.yml | 16 ++++- .github/workflows/macos_tests.yml | 34 +++++++++++ .github/workflows/main.yml | 2 + .github/workflows/pull_request.yml | 2 + .github/workflows/release_builds.yml | 20 +++++++ .github/workflows/unit_tests.yml | 20 +++++++ .github/workflows/wasm_swift_sdk.yml | 10 ++++ ...reBenchmarks.NIOAsyncChannel.init.p90.json | 3 + ...sixBenchmarks.TCPEchoAsyncChannel.p90.json | 3 + .../tests_04_performance/Thresholds/5.10.json | 59 ------------------- .../tests_04_performance/Thresholds/5.8.json | 50 ---------------- .../tests_04_performance/Thresholds/6.4.json | 59 +++++++++++++++++++ dev/update-integration-test-thresholds.sh | 16 ++--- scripts/check-matrix-job.sh | 4 ++ scripts/generate_matrix.sh | 11 ++++ scripts/install_swift_sdk.sh | 10 ++++ 18 files changed, 216 insertions(+), 121 deletions(-) create mode 100644 Benchmarks/Thresholds/6.4/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json create mode 100644 Benchmarks/Thresholds/6.4/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json delete mode 100644 IntegrationTests/tests_04_performance/Thresholds/5.10.json delete mode 100644 IntegrationTests/tests_04_performance/Thresholds/5.8.json create mode 100644 IntegrationTests/tests_04_performance/Thresholds/6.4.json diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 071f7bd5b..cd32b8b85 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -37,6 +37,10 @@ on: type: boolean description: "Boolean to enable the Linux 6.3 Swift version matrix job. Defaults to true." default: true + linux_6_4_enabled: + type: boolean + description: "Boolean to enable the Linux 6.4 Swift version matrix job. Defaults to true." + default: true linux_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." @@ -70,6 +74,10 @@ on: type: boolean description: "Boolean to enable the Windows 6.3 Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking default: false + windows_6_4_enabled: + type: boolean + description: "Boolean to enable the Windows 6.4 Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking + default: false windows_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows benchmarking @@ -122,6 +130,7 @@ jobs: MATRIX_LINUX_6_1_ENABLED: ${{ inputs.linux_6_1_enabled }} MATRIX_LINUX_6_2_ENABLED: ${{ inputs.linux_6_2_enabled }} MATRIX_LINUX_6_3_ENABLED: ${{ inputs.linux_6_3_enabled }} + MATRIX_LINUX_6_4_ENABLED: ${{ inputs.linux_6_4_enabled }} MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_next_enabled }} MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }} diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml index c6bdb5e5c..64f6c740f 100644 --- a/.github/workflows/cxx_interop.yml +++ b/.github/workflows/cxx_interop.yml @@ -30,6 +30,10 @@ on: type: boolean description: "Boolean to enable the Linux 6.3 Swift version matrix job. Defaults to true." default: true + linux_6_4_enabled: + type: boolean + description: "Boolean to enable the Linux 6.4 Swift version matrix job. Defaults to true." + default: true linux_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." @@ -63,6 +67,10 @@ on: type: boolean description: "Boolean to enable the Windows 6.3 Swift version matrix job. Defaults to false. Currently has no effect!" # TODO: implement Windows Cxx compat checking default: false + windows_6_4_enabled: + type: boolean + description: "Boolean to enable the Windows 6.4 Swift version matrix job. Defaults to false. Currently has no effect!" # TODO: implement Windows Cxx compat checking + default: false windows_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows Cxx compat checking @@ -126,6 +134,7 @@ jobs: MATRIX_LINUX_6_1_ENABLED: ${{ inputs.linux_6_1_enabled }} MATRIX_LINUX_6_2_ENABLED: ${{ inputs.linux_6_2_enabled }} MATRIX_LINUX_6_3_ENABLED: ${{ inputs.linux_6_3_enabled }} + MATRIX_LINUX_6_4_ENABLED: ${{ inputs.linux_6_4_enabled }} MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_next_enabled }} MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }} diff --git a/.github/workflows/macos_benchmarks.yml b/.github/workflows/macos_benchmarks.yml index 2e362695a..4392d03eb 100644 --- a/.github/workflows/macos_benchmarks.yml +++ b/.github/workflows/macos_benchmarks.yml @@ -55,6 +55,10 @@ on: type: boolean description: "Boolean to enable the macOS Swift 6.3 benchmark job. Defaults to false." default: false + macos_swift_6_4_enabled: + type: boolean + description: "Boolean to enable the macOS Swift 6.4 benchmark job. Defaults to false." + default: false macos_runner_pool: type: string @@ -84,7 +88,8 @@ jobs: inputs.macos_xcode_latest_beta_enabled || inputs.macos_swift_6_1_enabled || inputs.macos_swift_6_2_enabled || - inputs.macos_swift_6_3_enabled + inputs.macos_swift_6_3_enabled || + inputs.macos_swift_6_4_enabled outputs: macos-matrix: '${{ steps.generate-matrix.outputs.macos-matrix }}' steps: @@ -112,6 +117,7 @@ jobs: swift_6_1_enabled="${MACOS_SWIFT_6_1_ENABLED}" swift_6_2_enabled="${MACOS_SWIFT_6_2_ENABLED}" swift_6_3_enabled="${MACOS_SWIFT_6_3_ENABLED}" + swift_6_4_enabled="${MACOS_SWIFT_6_4_ENABLED}" # Create matrix from inputs matrix='{"config": []}' @@ -179,6 +185,13 @@ jobs: '.config[.config| length] |= . + { "name": "macOS (Swift 6.3)", "xcode_version": "swift 6.3", "xcode_app": "Xcode_swift_6.3.app", "os": "tahoe", "arch": "ARM64", "pool": $runner_pool, "env": $env_vars }') fi + if [[ "$swift_6_4_enabled" == "true" ]]; then + matrix=$(echo "$matrix" | jq -c \ + --arg runner_pool "$runner_pool" \ + --argjson env_vars "$macos_env_vars_json" \ + '.config[.config| length] |= . + { "name": "macOS (Swift 6.4)", "xcode_version": "swift 6.4", "xcode_app": "Xcode_swift_6.4.app", "os": "tahoe", "arch": "ARM64", "pool": $runner_pool, "env": $env_vars }') + fi + echo "macos-matrix=$matrix" >> "$GITHUB_OUTPUT" env: INPUT_MACOS_ENV_VARS: ${{ inputs.macos_env_vars }} @@ -192,6 +205,7 @@ jobs: MACOS_SWIFT_6_1_ENABLED: ${{ inputs.macos_swift_6_1_enabled }} MACOS_SWIFT_6_2_ENABLED: ${{ inputs.macos_swift_6_2_enabled }} MACOS_SWIFT_6_3_ENABLED: ${{ inputs.macos_swift_6_3_enabled }} + MACOS_SWIFT_6_4_ENABLED: ${{ inputs.macos_swift_6_4_enabled }} benchmarks-macos: name: ${{ matrix.config.name }} diff --git a/.github/workflows/macos_tests.yml b/.github/workflows/macos_tests.yml index 0246b069b..3299b7d57 100644 --- a/.github/workflows/macos_tests.yml +++ b/.github/workflows/macos_tests.yml @@ -151,6 +151,22 @@ on: type: string description: "The command(s) to be executed before all other work." default: "" + swift_6_4_enabled: + type: boolean + description: "Boolean to enable the Swift 6.4 jobs. Defaults to true." + default: true + swift_6_4_build_arguments_override: + type: string + description: "The arguments passed to swift build in the Swift 6.4 job." + default: "" + swift_6_4_test_arguments_override: + type: string + description: "The arguments passed to swift test in the Swift 6.4 job." + default: "" + swift_6_4_setup_command: + type: string + description: "The command(s) to be executed before all other work." + default: "" build_scheme: type: string @@ -260,6 +276,10 @@ jobs: swift_6_3_build_arguments_override="${MATRIX_SWIFT_6_3_BUILD_ARGUMENTS_OVERRIDE:=""}" swift_6_3_test_arguments_override="${MATRIX_SWIFT_6_3_TEST_ARGUMENTS_OVERRIDE:=""}" swift_6_3_setup_command="${MATRIX_SWIFT_6_3_SETUP_COMMAND:=""}" + swift_6_4_enabled="${MATRIX_SWIFT_6_4_ENABLED:=true}" + swift_6_4_build_arguments_override="${MATRIX_SWIFT_6_4_BUILD_ARGUMENTS_OVERRIDE:=""}" + swift_6_4_test_arguments_override="${MATRIX_SWIFT_6_4_TEST_ARGUMENTS_OVERRIDE:=""}" + swift_6_4_setup_command="${MATRIX_SWIFT_6_4_SETUP_COMMAND:=""}" # Create matrix from inputs matrix='{"config": []}' @@ -314,6 +334,16 @@ jobs: '.config[.config| length] |= . + { "name": "Swift 6.3", "xcode_version": "swift 6.3", "xcode_app": "Xcode_swift_6.3.app", "setup_command": $setup_command, "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "tahoe", "arch": "ARM64", "pool": $runner_pool, "env": $env_vars }') fi + if [[ "$swift_6_4_enabled" == "true" ]]; then + matrix=$(echo "$matrix" | jq -c \ + --arg setup_command "$swift_6_4_setup_command" \ + --arg build_arguments_override "$swift_6_4_build_arguments_override" \ + --arg test_arguments_override "$swift_6_4_test_arguments_override" \ + --arg runner_pool "$runner_pool" \ + --argjson env_vars "$env_vars_json" \ + '.config[.config| length] |= . + { "name": "Swift 6.4", "xcode_version": "swift 6.4", "xcode_app": "Xcode_swift_6.4.app", "setup_command": $setup_command, "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "tahoe", "arch": "ARM64", "pool": $runner_pool, "env": $env_vars }') + fi + echo "$matrix" | jq -c )" EOM @@ -340,6 +370,10 @@ jobs: MATRIX_SWIFT_6_3_BUILD_ARGUMENTS_OVERRIDE: ${{ inputs.swift_6_3_build_arguments_override }} MATRIX_SWIFT_6_3_TEST_ARGUMENTS_OVERRIDE: ${{ inputs.swift_6_3_test_arguments_override }} MATRIX_SWIFT_6_3_SETUP_COMMAND: ${{ inputs.swift_6_3_setup_command }} + MATRIX_SWIFT_6_4_ENABLED: ${{ inputs.swift_6_4_enabled }} + MATRIX_SWIFT_6_4_BUILD_ARGUMENTS_OVERRIDE: ${{ inputs.swift_6_4_build_arguments_override }} + MATRIX_SWIFT_6_4_TEST_ARGUMENTS_OVERRIDE: ${{ inputs.swift_6_4_test_arguments_override }} + MATRIX_SWIFT_6_4_SETUP_COMMAND: ${{ inputs.swift_6_4_setup_command }} darwin-job: name: ${{ matrix.config.name }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdd256520..fc5186c01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,11 @@ jobs: linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" + linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" windows_6_3_enabled: true + windows_6_4_enabled: true windows_nightly_next_enabled: true windows_nightly_main_enabled: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b5499a3c4..33fff3dd9 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -24,10 +24,12 @@ jobs: linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_3_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" + linux_6_4_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_next_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error" linux_env_vars: '{"SWIFTNIO_CI": "1"}' windows_6_3_enabled: true + windows_6_4_enabled: true windows_nightly_next_enabled: true windows_nightly_main_enabled: true diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index 70971246a..4078bb055 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -46,6 +46,14 @@ on: type: string description: "The arguments passed to swift test in the Linux 6.3 Swift version matrix job." default: "" + linux_6_4_enabled: + type: boolean + description: "Boolean to enable the Linux 6.4 Swift version matrix job. Defaults to true." + default: true + linux_6_4_arguments_override: + type: string + description: "The arguments passed to swift test in the Linux 6.4 Swift version matrix job." + default: "" linux_nightly_next_enabled: type: boolean description: "Boolean to enable the Linux matrix job using the nightly build for the next Swift version. Defaults to true." @@ -95,6 +103,14 @@ on: type: string description: "The arguments passed to swift test in the Windows 6.3 Swift version matrix job." default: "" + windows_6_4_enabled: + type: boolean + description: "Boolean to enable the Windows 6.4 Swift version matrix job. Defaults to false." + default: false + windows_6_4_arguments_override: + type: string + description: "The arguments passed to swift test in the Windows 6.4 Swift version matrix job." + default: "" windows_nightly_next_enabled: type: boolean description: "Boolean to enable the Windows matrix job using the nightly build for the next Swift version. Defaults to false." @@ -170,6 +186,8 @@ jobs: MATRIX_LINUX_6_2_COMMAND_ARGUMENTS: ${{ inputs.linux_6_2_arguments_override }} MATRIX_LINUX_6_3_ENABLED: ${{ inputs.linux_6_3_enabled }} MATRIX_LINUX_6_3_COMMAND_ARGUMENTS: ${{ inputs.linux_6_3_arguments_override }} + MATRIX_LINUX_6_4_ENABLED: ${{ inputs.linux_6_4_enabled }} + MATRIX_LINUX_6_4_COMMAND_ARGUMENTS: ${{ inputs.linux_6_4_arguments_override }} MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_next_enabled }} MATRIX_LINUX_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_next_arguments_override }} MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }} @@ -183,6 +201,8 @@ jobs: MATRIX_WINDOWS_6_2_COMMAND_ARGUMENTS: ${{ inputs.windows_6_2_arguments_override }} MATRIX_WINDOWS_6_3_ENABLED: ${{ inputs.windows_6_3_enabled }} MATRIX_WINDOWS_6_3_COMMAND_ARGUMENTS: ${{ inputs.windows_6_3_arguments_override }} + MATRIX_WINDOWS_6_4_ENABLED: ${{ inputs.windows_6_4_enabled }} + MATRIX_WINDOWS_6_4_COMMAND_ARGUMENTS: ${{ inputs.windows_6_4_arguments_override }} MATRIX_WINDOWS_NIGHTLY_NEXT_ENABLED: ${{ inputs.windows_nightly_next_enabled }} MATRIX_WINDOWS_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_next_arguments_override }} MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }} diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index d2e90a614..57444f1dc 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -54,6 +54,14 @@ on: type: string description: "The arguments passed to swift test in the Linux 6.3 Swift version matrix job." default: "" + linux_6_4_enabled: + type: boolean + description: "Boolean to enable the Linux 6.4 Swift version matrix job. Defaults to true." + default: true + linux_6_4_arguments_override: + type: string + description: "The arguments passed to swift test in the Linux 6.4 Swift version matrix job." + default: "" linux_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." @@ -119,6 +127,14 @@ on: type: string description: "The arguments passed to swift test in the Windows 6.3 Swift version matrix job." default: "" + windows_6_4_enabled: + type: boolean + description: "Boolean to enable the Windows 6.4 Swift version matrix job. Defaults to false." + default: false + windows_6_4_arguments_override: + type: string + description: "The arguments passed to swift test in the Windows 6.4 Swift version matrix job." + default: "" windows_nightly_6_0_enabled: type: boolean description: "⚠️ Deprecated, we no longer run against 6.0 nightly." @@ -214,6 +230,8 @@ jobs: MATRIX_LINUX_6_2_COMMAND_ARGUMENTS: ${{ inputs.linux_6_2_arguments_override }} MATRIX_LINUX_6_3_ENABLED: ${{ inputs.linux_6_3_enabled }} MATRIX_LINUX_6_3_COMMAND_ARGUMENTS: ${{ inputs.linux_6_3_arguments_override }} + MATRIX_LINUX_6_4_ENABLED: ${{ inputs.linux_6_4_enabled }} + MATRIX_LINUX_6_4_COMMAND_ARGUMENTS: ${{ inputs.linux_6_4_arguments_override }} MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_next_enabled }} MATRIX_LINUX_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }} ${{ inputs.linux_nightly_next_arguments_override }} MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }} @@ -227,6 +245,8 @@ jobs: MATRIX_WINDOWS_6_2_COMMAND_ARGUMENTS: ${{ inputs.windows_6_2_arguments_override }} MATRIX_WINDOWS_6_3_ENABLED: ${{ inputs.windows_6_3_enabled }} MATRIX_WINDOWS_6_3_COMMAND_ARGUMENTS: ${{ inputs.windows_6_3_arguments_override }} + MATRIX_WINDOWS_6_4_ENABLED: ${{ inputs.windows_6_4_enabled }} + MATRIX_WINDOWS_6_4_COMMAND_ARGUMENTS: ${{ inputs.windows_6_4_arguments_override }} MATRIX_WINDOWS_NIGHTLY_NEXT_ENABLED: ${{ inputs.windows_nightly_6_1_enabled || inputs.windows_nightly_next_enabled }} MATRIX_WINDOWS_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }} ${{ inputs.windows_nightly_next_arguments_override }} MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }} diff --git a/.github/workflows/wasm_swift_sdk.yml b/.github/workflows/wasm_swift_sdk.yml index 4a8c4ae51..cbb45f548 100644 --- a/.github/workflows/wasm_swift_sdk.yml +++ b/.github/workflows/wasm_swift_sdk.yml @@ -18,6 +18,10 @@ on: type: boolean description: "Boolean to enable the 6.3 release WASM Swift SDK matrix job. Defaults to true." default: true + release_6_4_enabled: + type: boolean + description: "Boolean to enable the 6.4 release WASM Swift SDK matrix job. Defaults to true." + default: true env_vars: type: string description: "Environment variables for jobs as JSON (e.g., '{\"DEBUG\":\"1\",\"LOG_LEVEL\":\"info\"}')." @@ -86,6 +90,11 @@ jobs: entries="${entries:+${entries},}${entry}" fi + if [[ "$INPUT_RELEASE_6_4_ENABLED" == "true" ]]; then + entry=$(make_entry "6.4" "INSTALL_SWIFT_VERSION=6.4") + entries="${entries:+${entries},}${entry}" + fi + if [[ -z "$entries" ]]; then echo "Error: No WASM Swift SDK matrix jobs enabled" exit 1 @@ -96,6 +105,7 @@ jobs: INPUT_NIGHTLY_MAIN_ENABLED: ${{ inputs.nightly_main_enabled }} INPUT_NIGHTLY_NEXT_ENABLED: ${{ inputs.nightly_next_enabled }} INPUT_RELEASE_6_3_ENABLED: ${{ inputs.release_6_3_enabled }} + INPUT_RELEASE_6_4_ENABLED: ${{ inputs.release_6_4_enabled }} INPUT_ENV_VARS: ${{ inputs.env_vars }} INPUT_ADDITIONAL_COMMAND_ARGUMENTS: ${{ inputs.additional_command_arguments }} NIGHTLY_NEXT_VERSION: nightly-6.4 diff --git a/Benchmarks/Thresholds/6.4/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json b/Benchmarks/Thresholds/6.4/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json new file mode 100644 index 000000000..ec2d0ad0f --- /dev/null +++ b/Benchmarks/Thresholds/6.4/NIOCoreBenchmarks.NIOAsyncChannel.init.p90.json @@ -0,0 +1,3 @@ +{ + "mallocCountTotal" : 8000 +} \ No newline at end of file diff --git a/Benchmarks/Thresholds/6.4/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json b/Benchmarks/Thresholds/6.4/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json new file mode 100644 index 000000000..03e0a2c46 --- /dev/null +++ b/Benchmarks/Thresholds/6.4/NIOPosixBenchmarks.TCPEchoAsyncChannel.p90.json @@ -0,0 +1,3 @@ +{ + "mallocCountTotal": 387 +} diff --git a/IntegrationTests/tests_04_performance/Thresholds/5.10.json b/IntegrationTests/tests_04_performance/Thresholds/5.10.json deleted file mode 100644 index 9b67ff6fd..000000000 --- a/IntegrationTests/tests_04_performance/Thresholds/5.10.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "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": 26350, - "1000_rst_connections": 132050, - "1000_tcpbootstraps": 3050, - "1000_tcpconnections": 140050, - "1000_udp_reqs": 4050, - "1000_udpbootstraps": 2050, - "1000_udpconnections": 75050, - "1_reqs_1000_conn": 375050, - "assume_isolated_scheduling_10000_executions": 89, - "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, - "flat_schedule_10000_tasks": 100100, - "flat_schedule_assume_isolated_10000_tasks": 90100, - "future_assume_isolated_lots_of_callbacks": 68050, - "future_erase_result": 4050, - "future_lots_of_callbacks": 68050, - "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": 305, - "read_10000_chunks_from_file": 110050, - "schedule_10000_tasks": 40100, - "schedule_and_run_10000_tasks": 50050, - "schedule_assume_isolated_10000_tasks": 40100, - "schedule_with_deadline_10000_tasks": 40100, - "schedule_with_deadline_assume_isolated_10000_tasks": 40100, - "scheduling_10000_executions": 89, - "submit_10000_tasks": 20100, - "submit_assume_isolated_10000_tasks": 20100, - "udp_1000_reqs_1_conn": 6200, - "udp_1_reqs_1000_conn": 162050 -} diff --git a/IntegrationTests/tests_04_performance/Thresholds/5.8.json b/IntegrationTests/tests_04_performance/Thresholds/5.8.json deleted file mode 100644 index 3b4b6ec19..000000000 --- a/IntegrationTests/tests_04_performance/Thresholds/5.8.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "10000000_asyncsequenceproducer": 20, - "1000000_asyncwriter": 1000015, - "1000_addHandlers": 43000, - "1000_addHandlers_sync": 36000, - "1000_addRemoveHandlers_handlercontext": 8032, - "1000_addRemoveHandlers_handlername": 8032, - "1000_addRemoveHandlers_handlertype": 8032, - "1000_autoReadGetAndSet": 18000, - "1000_autoReadGetAndSet_sync": 0, - "1000_copying_bytebufferview_to_array": 1000, - "1000_copying_circularbuffer_to_array": 1000, - "1000_getHandlers": 8034, - "1000_getHandlers_sync": 34, - "1000_reqs_1_conn": 26372, - "1000_rst_connections": 141004, - "1000_tcpbootstraps": 4001, - "1000_tcpconnections": 148002, - "1000_udp_reqs": 4014, - "1000_udpbootstraps": 2000, - "1000_udpconnections": 75008, - "1_reqs_1000_conn": 398000, - "bytebuffer_lots_of_rw": 2005, - "creating_10000_headers": 0, - "decode_1000_ws_frames": 2000, - "encode_1000_ws_frames_holding_buffer": 3, - "encode_1000_ws_frames_holding_buffer_with_mask": 2003, - "encode_1000_ws_frames_holding_buffer_with_space": 3, - "encode_1000_ws_frames_holding_buffer_with_space_with_mask": 2003, - "encode_1000_ws_frames_new_buffer": 3000, - "encode_1000_ws_frames_new_buffer_with_mask": 5000, - "encode_1000_ws_frames_new_buffer_with_space": 3000, - "encode_1000_ws_frames_new_buffer_with_space_with_mask": 5000, - "execute_hop_10000_tasks": 0, - "future_erase_result": 4001, - "future_lots_of_callbacks": 53001, - "get_100000_headers_canonical_form": 700000, - "get_100000_headers_canonical_form_trimming_whitespace": 700000, - "get_100000_headers_canonical_form_trimming_whitespace_from_long_string": 700000, - "get_100000_headers_canonical_form_trimming_whitespace_from_short_string": 700000, - "modifying_1000_circular_buffer_elements": 0, - "modifying_byte_buffer_view": 6000, - "ping_pong_1000_reqs_1_conn": 334, - "read_10000_chunks_from_file": 110009, - "schedule_10000_tasks": 40084, - "schedule_and_run_10000_tasks": 50010, - "scheduling_10000_executions": 89, - "udp_1000_reqs_1_conn": 6156, - "udp_1_reqs_1000_conn": 162000 -} diff --git a/IntegrationTests/tests_04_performance/Thresholds/6.4.json b/IntegrationTests/tests_04_performance/Thresholds/6.4.json new file mode 100644 index 000000000..456ce4d7d --- /dev/null +++ b/IntegrationTests/tests_04_performance/Thresholds/6.4.json @@ -0,0 +1,59 @@ +{ + "10000000_asyncsequenceproducer": 0, + "1000000_asyncwriter": 0, + "1000_addHandlers": 0, + "1000_addHandlers_sync": 0, + "1000_addRemoveHandlers_handlercontext": 0, + "1000_addRemoveHandlers_handlername": 0, + "1000_addRemoveHandlers_handlertype": 0, + "1000_autoReadGetAndSet": 0, + "1000_autoReadGetAndSet_sync": 0, + "1000_copying_bytebufferview_to_array": 0, + "1000_copying_circularbuffer_to_array": 0, + "1000_getHandlers": 0, + "1000_getHandlers_sync": 0, + "1000_reqs_1_conn": 3050, + "1000_rst_connections": 2050, + "1000_tcpbootstraps": 0, + "1000_tcpconnections": 4050, + "1000_udp_reqs": 1050, + "1000_udpbootstraps": 0, + "1000_udpconnections": 1, + "1_reqs_1000_conn": 10050, + "assume_isolated_scheduling_10000_executions": 0, + "bytebuffer_lots_of_rw": 1, + "creating_10000_headers": 0, + "decode_1000_ws_frames": 0, + "encode_1000_ws_frames_holding_buffer": 1, + "encode_1000_ws_frames_holding_buffer_with_mask": 1050, + "encode_1000_ws_frames_holding_buffer_with_space": 1, + "encode_1000_ws_frames_holding_buffer_with_space_with_mask": 1050, + "encode_1000_ws_frames_new_buffer": 1050, + "encode_1000_ws_frames_new_buffer_with_mask": 2050, + "encode_1000_ws_frames_new_buffer_with_space": 1050, + "encode_1000_ws_frames_new_buffer_with_space_with_mask": 2050, + "execute_hop_10000_tasks": 0, + "flat_schedule_10000_tasks": 0, + "flat_schedule_assume_isolated_10000_tasks": 0, + "future_assume_isolated_lots_of_callbacks": 0, + "future_erase_result": 0, + "future_lots_of_callbacks": 0, + "get_100000_headers_canonical_form": 0, + "get_100000_headers_canonical_form_trimming_whitespace": 0, + "get_100000_headers_canonical_form_trimming_whitespace_from_long_string": 0, + "get_100000_headers_canonical_form_trimming_whitespace_from_short_string": 0, + "modifying_1000_circular_buffer_elements": 0, + "modifying_byte_buffer_view": 3050, + "ping_pong_1000_reqs_1_conn": 6, + "read_10000_chunks_from_file": 10050, + "schedule_10000_tasks": 0, + "schedule_and_run_10000_tasks": 0, + "schedule_assume_isolated_10000_tasks": 0, + "schedule_with_deadline_10000_tasks": 0, + "schedule_with_deadline_assume_isolated_10000_tasks": 0, + "scheduling_10000_executions": 0, + "submit_10000_tasks": 0, + "submit_assume_isolated_10000_tasks": 0, + "udp_1000_reqs_1_conn": 1050, + "udp_1_reqs_1000_conn": 7050 +} diff --git a/dev/update-integration-test-thresholds.sh b/dev/update-integration-test-thresholds.sh index a85fccd72..0cb8ce6d7 100755 --- a/dev/update-integration-test-thresholds.sh +++ b/dev/update-integration-test-thresholds.sh @@ -62,23 +62,17 @@ map_version() { check_line=$1 case "$check_line" in - *"(5.8)"*) - echo "5.8" - ;; - *"(5.10)"*) - echo "5.10" - ;; - *"(6.0)"*) - echo "6.0" - ;; *"(6.1)"*) echo "6.1" ;; *"(6.2)"*) echo "6.2" ;; - *"(nightly-6.1)"*) - echo "nightly-6.1" + *"(6.3)"*) + echo "6.3" + ;; + *"(6.4)"*) + echo "6.4" ;; *"(nightly-next)"*) echo "nightly-next" diff --git a/scripts/check-matrix-job.sh b/scripts/check-matrix-job.sh index 07819d039..aed11d4ee 100755 --- a/scripts/check-matrix-job.sh +++ b/scripts/check-matrix-job.sh @@ -28,6 +28,7 @@ command_6_0="${COMMAND_OVERRIDE_6_0:=""}" command_6_1="${COMMAND_OVERRIDE_6_1:=""}" command_6_2="${COMMAND_OVERRIDE_6_2:=""}" command_6_3="${COMMAND_OVERRIDE_6_3:=""}" +command_6_4="${COMMAND_OVERRIDE_6_4:=""}" command_nightly_next="${COMMAND_OVERRIDE_NIGHTLY_NEXT:=""}" command_nightly_main="${COMMAND_OVERRIDE_NIGHTLY_MAIN:=""}" @@ -49,6 +50,9 @@ elif [[ "$swift_version" == "6.2" ]] && [[ -n "$command_6_2" ]]; then elif [[ "$swift_version" == "6.3" ]] && [[ -n "$command_6_3" ]]; then log "Running 6.3 command override" eval "$command_6_3" +elif [[ "$swift_version" == "6.4" ]] && [[ -n "$command_6_4" ]]; then + log "Running 6.4 command override" + eval "$command_6_4" elif [[ "$swift_version" == "nightly-next" ]] && [[ -n "$command_nightly_next" ]]; then log "Running nightly next command override" eval "$command_nightly_next" diff --git a/scripts/generate_matrix.sh b/scripts/generate_matrix.sh index f02b1da80..7f50aa7ba 100755 --- a/scripts/generate_matrix.sh +++ b/scripts/generate_matrix.sh @@ -41,10 +41,12 @@ linux_6_0_enabled="${MATRIX_LINUX_6_0_ENABLED:=true}" linux_6_1_enabled="${MATRIX_LINUX_6_1_ENABLED:=true}" linux_6_2_enabled="${MATRIX_LINUX_6_2_ENABLED:=true}" linux_6_3_enabled="${MATRIX_LINUX_6_3_ENABLED:=true}" +linux_6_4_enabled="${MATRIX_LINUX_6_4_ENABLED:=true}" linux_6_0_command_arguments="${MATRIX_LINUX_6_0_COMMAND_ARGUMENTS:-}" linux_6_1_command_arguments="${MATRIX_LINUX_6_1_COMMAND_ARGUMENTS:-}" linux_6_2_command_arguments="${MATRIX_LINUX_6_2_COMMAND_ARGUMENTS:-}" linux_6_3_command_arguments="${MATRIX_LINUX_6_3_COMMAND_ARGUMENTS:-}" +linux_6_4_command_arguments="${MATRIX_LINUX_6_4_COMMAND_ARGUMENTS:-}" linux_nightly_next_enabled="${MATRIX_LINUX_NIGHTLY_NEXT_ENABLED:=true}" linux_nightly_next_command_arguments="${MATRIX_LINUX_NIGHTLY_NEXT_COMMAND_ARGUMENTS:-}" linux_nightly_main_enabled="${MATRIX_LINUX_NIGHTLY_MAIN_ENABLED:=true}" @@ -56,10 +58,12 @@ windows_6_0_enabled="${MATRIX_WINDOWS_6_0_ENABLED:=false}" windows_6_1_enabled="${MATRIX_WINDOWS_6_1_ENABLED:=false}" windows_6_2_enabled="${MATRIX_WINDOWS_6_2_ENABLED:=false}" windows_6_3_enabled="${MATRIX_WINDOWS_6_3_ENABLED:=false}" +windows_6_4_enabled="${MATRIX_WINDOWS_6_4_ENABLED:=false}" windows_6_0_command_arguments="${MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS:-}" windows_6_1_command_arguments="${MATRIX_WINDOWS_6_1_COMMAND_ARGUMENTS:-}" windows_6_2_command_arguments="${MATRIX_WINDOWS_6_2_COMMAND_ARGUMENTS:-}" windows_6_3_command_arguments="${MATRIX_WINDOWS_6_3_COMMAND_ARGUMENTS:-}" +windows_6_4_command_arguments="${MATRIX_WINDOWS_6_4_COMMAND_ARGUMENTS:-}" windows_nightly_next_enabled="${MATRIX_WINDOWS_NIGHTLY_NEXT_ENABLED:=false}" windows_nightly_next_command_arguments="${MATRIX_WINDOWS_NIGHTLY_NEXT_COMMAND_ARGUMENTS:-}" windows_nightly_main_enabled="${MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED:=false}" @@ -77,6 +81,7 @@ linux_6_0_container_image="swift:6.0-jammy" linux_6_1_container_image="swift:6.1-jammy" linux_6_2_container_image="swift:6.2-noble" linux_6_3_container_image="swift:6.3-noble" +linux_6_4_container_image="swift:6.4-resolute" linux_nightly_next_container_image="swiftlang/swift:nightly-6.4.x-noble" linux_nightly_main_container_image="swiftlang/swift:nightly-main-noble" @@ -88,6 +93,8 @@ windows_6_2_runner="windows-2022" windows_6_2_container_image="swift:6.2-windowsservercore-ltsc2022" windows_6_3_runner="windows-2022" windows_6_3_container_image="swift:6.3-windowsservercore-ltsc2022" +windows_6_4_runner="windows-2022" +windows_6_4_container_image="swift:6.4-windowsservercore-ltsc2022" windows_nightly_next_runner="windows-2022" windows_nightly_next_container_image="swiftlang/swift:nightly-6.4.x-windowsservercore-ltsc2022" windows_nightly_main_runner="windows-2022" @@ -310,6 +317,7 @@ if [[ \ "$linux_6_1_enabled" == "true" || \ "$linux_6_2_enabled" == "true" || \ "$linux_6_3_enabled" == "true" || \ + "$linux_6_4_enabled" == "true" || \ "$linux_nightly_next_enabled" == "true" || \ "$linux_nightly_main_enabled" == "true" \ ]]; then @@ -325,6 +333,7 @@ add_matrix_entry "Linux" "6.0" "$linux_6_0_enabled" "$lin add_matrix_entry "Linux" "6.1" "$linux_6_1_enabled" "$linux_setup_command" "$linux_command" "$linux_6_1_command_arguments" "$linux_6_1_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" add_matrix_entry "Linux" "6.2" "$linux_6_2_enabled" "$linux_setup_command" "$linux_command" "$linux_6_2_command_arguments" "$linux_6_2_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" add_matrix_entry "Linux" "6.3" "$linux_6_3_enabled" "$linux_setup_command" "$linux_command" "$linux_6_3_command_arguments" "$linux_6_3_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" +add_matrix_entry "Linux" "6.4" "$linux_6_4_enabled" "$linux_setup_command" "$linux_command" "$linux_6_4_command_arguments" "$linux_6_4_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" add_matrix_entry "Linux" "nightly-next" "$linux_nightly_next_enabled" "$linux_setup_command" "$linux_command" "$linux_nightly_next_command_arguments" "$linux_nightly_next_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" add_matrix_entry "Linux" "nightly-main" "$linux_nightly_main_enabled" "$linux_setup_command" "$linux_command" "$linux_nightly_main_command_arguments" "$linux_nightly_main_container_image" "$linux_runner" "$linux_env_vars_json" "$linux_dockerfile" "$linux_docker_capabilities_json" "$linux_docker_security_opts_json" @@ -334,6 +343,7 @@ if [[ \ "$windows_6_1_enabled" == "true" || \ "$windows_6_2_enabled" == "true" || \ "$windows_6_3_enabled" == "true" || \ + "$windows_6_4_enabled" == "true" || \ "$windows_nightly_next_enabled" == "true" || \ "$windows_nightly_main_enabled" == "true" \ ]]; then @@ -347,6 +357,7 @@ add_matrix_entry "Windows" "6.0" "$windows_6_0_enabled" "$w add_matrix_entry "Windows" "6.1" "$windows_6_1_enabled" "$windows_setup_command" "$windows_command" "$windows_6_1_command_arguments" "$windows_6_1_container_image" "$windows_6_1_runner" "$windows_env_vars_json" add_matrix_entry "Windows" "6.2" "$windows_6_2_enabled" "$windows_setup_command" "$windows_command" "$windows_6_2_command_arguments" "$windows_6_2_container_image" "$windows_6_2_runner" "$windows_env_vars_json" add_matrix_entry "Windows" "6.3" "$windows_6_3_enabled" "$windows_setup_command" "$windows_command" "$windows_6_3_command_arguments" "$windows_6_3_container_image" "$windows_6_3_runner" "$windows_env_vars_json" +add_matrix_entry "Windows" "6.4" "$windows_6_4_enabled" "$windows_setup_command" "$windows_command" "$windows_6_4_command_arguments" "$windows_6_4_container_image" "$windows_6_4_runner" "$windows_env_vars_json" add_matrix_entry "Windows" "nightly-next" "$windows_nightly_next_enabled" "$windows_setup_command" "$windows_command" "$windows_nightly_next_command_arguments" "$windows_nightly_next_container_image" "$windows_nightly_next_runner" "$windows_env_vars_json" add_matrix_entry "Windows" "nightly-main" "$windows_nightly_main_enabled" "$windows_setup_command" "$windows_command" "$windows_nightly_main_command_arguments" "$windows_nightly_main_container_image" "$windows_nightly_main_runner" "$windows_env_vars_json" diff --git a/scripts/install_swift_sdk.sh b/scripts/install_swift_sdk.sh index f2d96d64f..361d1cfd6 100755 --- a/scripts/install_swift_sdk.sh +++ b/scripts/install_swift_sdk.sh @@ -176,6 +176,16 @@ elif [[ -n "$version" ]]; then log "Discovered latest Swift version: $version" else + # From Swift 6.4 onwards, release tags and download paths always include the patch version (e.g. 6.4.0) + if [[ "$version" =~ ^([0-9]+)\.([0-9]+)$ ]]; then + major="${BASH_REMATCH[1]}" + minor="${BASH_REMATCH[2]}" + if (( major > 6 || (major == 6 && minor >= 4) )); then + version="${version}.0" + log "Normalized version to $version" + fi + fi + # For specific versions, we need to fetch the release info log "Getting release information for version $version" # shellcheck disable=SC2016 # Our use of JQ_BIN means that shellcheck can't tell this is a `jq` invocation