From 8840ce85c7e565dbfb7b6561946022616cf9fb53 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 22 Oct 2025 14:42:24 +0100 Subject: [PATCH 1/3] Android SDK GitHub Actions Workflow Motivation: Android SDKs now exist and testing is good. Modifications: Add an Android GitHub Actions workflow using the latest nightly image and enable it in NIO targetting NIOCore (matching WASM testing). Result: More reusable workflows and more test coverage for NIO --- .github/workflows/android_sdk.yml | 40 +++++++++++++++++++++++++ .github/workflows/main.yml | 7 +++++ .github/workflows/pull_request.yml | 7 +++++ scripts/install_swift_sdk.sh | 4 +++ scripts/swift-build-with-android-sdk.sh | 26 ++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 .github/workflows/android_sdk.yml create mode 100755 scripts/swift-build-with-android-sdk.sh diff --git a/.github/workflows/android_sdk.yml b/.github/workflows/android_sdk.yml new file mode 100644 index 0000000000..e970a7b908 --- /dev/null +++ b/.github/workflows/android_sdk.yml @@ -0,0 +1,40 @@ +name: Android SDK + +permissions: + contents: read + +on: + workflow_call: + inputs: + env_vars: + type: string + description: "Environment variables for jobs as JSON (e.g., '{\"DEBUG\":\"1\",\"LOG_LEVEL\":\"info\"}')." + default: "{}" + additional_command_arguments: + type: string + description: "Additional arguments passed to swift build (the Android SDK will be specified). Defaults to empty." + default: "" + +jobs: + android-sdk: + name: Android Swift SDK + # Workaround https://github.com/nektos/act/issues/1875 + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + with: + name: "Android Swift SDK" + matrix_string: >- + { + "config":[ + { + "name":"main Jammy", + "swift_version":"main", + "platform":"Linux", + "runner":"ubuntu-latest", + "image":"ubuntu:jammy", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r", + "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-android-sdk.sh | bash -s --", + "command_arguments":"${{ inputs.additional_command_arguments }}", + "env":'"$env_vars_json"' + } + ] + } diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe482be693..1c63e64146 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,6 +71,13 @@ jobs: with: additional_command_arguments: "--target NIOCore" + android-sdk: + name: Android Swift SDK + # Workaround https://github.com/nektos/act/issues/1875 + uses: apple/swift-nio/.github/workflows/android_sdk.yml@main + with: + additional_command_arguments: "--target NIOCore" + macos-tests: name: macOS tests # Workaround https://github.com/nektos/act/issues/1875 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 527e4efb76..5b1e590eca 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -105,6 +105,13 @@ jobs: with: additional_command_arguments: "--target NIOCore" + android-sdk: + name: Android Swift SDK + # Workaround https://github.com/nektos/act/issues/1875 + uses: apple/swift-nio/.github/workflows/android_sdk.yml@main + with: + additional_command_arguments: "--target NIOCore" + release-builds: name: Release builds uses: apple/swift-nio/.github/workflows/release_builds.yml@main diff --git a/scripts/install_swift_sdk.sh b/scripts/install_swift_sdk.sh index af26da75f2..31a2205dfa 100755 --- a/scripts/install_swift_sdk.sh +++ b/scripts/install_swift_sdk.sh @@ -53,6 +53,10 @@ case "$sdk" in sdk_dir="wasm-sdk" sdk_suffix="_wasm" ;; + "android-sdk") + sdk_dir="android-sdk" + sdk_suffix="_android-0.1" + ;; *) fatal "Unexpected Swift SDK: $sdk" ;; diff --git a/scripts/swift-build-with-android-sdk.sh b/scripts/swift-build-with-android-sdk.sh new file mode 100755 index 0000000000..7dcfa44db2 --- /dev/null +++ b/scripts/swift-build-with-android-sdk.sh @@ -0,0 +1,26 @@ +#!/bin/bash +##===----------------------------------------------------------------------===## +## +## This source file is part of the SwiftNIO open source project +## +## Copyright (c) 2025 Apple Inc. and the SwiftNIO project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.txt for the list of SwiftNIO project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +set -uo pipefail + +# Select the Swift SDK for Android +SWIFT_SDK="$(swift sdk list | grep android | head -n1)" +if [[ -z "$SWIFT_SDK" ]]; then + echo "No Android Swift SDK found. Please ensure you have the Android Swift SDK installed." + exit 1 +fi + +echo "Using Swift SDK: $SWIFT_SDK" +swift build --swift-sdk "$SWIFT_SDK" "${@}" From 5d41e083da38468b5d1b8030633db33753c4ea59 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 22 Oct 2025 14:50:52 +0100 Subject: [PATCH 2/3] test shim --- .github/workflows/android_sdk.yml | 6 +++--- .github/workflows/benchmarks.yml | 6 +++--- .github/workflows/cmake_tests.yml | 4 ++-- .github/workflows/cxx_interop.yml | 6 +++--- .github/workflows/main.yml | 20 ++++++++++---------- .github/workflows/pull_request.yml | 20 ++++++++++---------- .github/workflows/release_builds.yml | 4 ++-- .github/workflows/static_sdk.yml | 6 +++--- .github/workflows/swift_load_test_matrix.yml | 2 +- .github/workflows/swift_matrix.yml | 6 +++--- .github/workflows/unit_tests.yml | 4 ++-- .github/workflows/wasm_sdk.yml | 6 +++--- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/android_sdk.yml b/.github/workflows/android_sdk.yml index e970a7b908..15c3981a51 100644 --- a/.github/workflows/android_sdk.yml +++ b/.github/workflows/android_sdk.yml @@ -19,7 +19,7 @@ jobs: android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Android Swift SDK" matrix_string: >- @@ -31,8 +31,8 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r", - "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-android-sdk.sh | bash -s --", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r", + "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/swift-build-with-android-sdk.sh | bash -s --", "command_arguments":"${{ inputs.additional_command_arguments }}", "env":'"$env_vars_json"' } diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index a89131eb36..f70161a551 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -102,9 +102,9 @@ jobs: exit 1 fi - echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: - MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash" + MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash" MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl libjemalloc-dev && git config --global --add safe.directory /$(basename ${{ github.workspace }})" MATRIX_MIN_SWIFT_VERSION: ${{ inputs.minimum_swift_version }} MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }} @@ -119,7 +119,7 @@ jobs: name: Benchmarks needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Benchmarks" matrix_string: '${{ needs.construct-matrix.outputs.benchmarks-matrix }}' diff --git a/.github/workflows/cmake_tests.yml b/.github/workflows/cmake_tests.yml index 7a0b80de4e..d20873e8eb 100644 --- a/.github/workflows/cmake_tests.yml +++ b/.github/workflows/cmake_tests.yml @@ -43,11 +43,11 @@ jobs: which curl jq || apt -q update which curl || apt -yq install curl which jq || apt -yq install jq - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash - name: CMake build run: | which curl cmake ninja || apt -q update which curl || apt -yq install curl which cmake || apt -yq install cmake which ninja || apt -yq install ninja-build - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml index bdce10750e..24b942ddc4 100644 --- a/.github/workflows/cxx_interop.yml +++ b/.github/workflows/cxx_interop.yml @@ -105,9 +105,9 @@ jobs: exit 1 fi - echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: - MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash" + MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-cxx-interop-compatibility.sh | bash" MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl jq" MATRIX_MIN_SWIFT_VERSION: ${{ inputs.minimum_swift_version }} MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }} @@ -122,7 +122,7 @@ jobs: name: Cxx interop needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Cxx interop" matrix_string: '${{ needs.construct-matrix.outputs.cxx-interop-matrix }}' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c63e64146..7c7baf37b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: unit-tests: name: Unit tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + uses: apple/swift-nio/.github/workflows/unit_tests.yml@android-sdk with: linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" @@ -25,12 +25,12 @@ jobs: cxx-interop: name: Cxx interop # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main + uses: apple/swift-nio/.github/workflows/cxx_interop.yml@android-sdk benchmarks: name: Benchmarks # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/benchmarks.yml@main + uses: apple/swift-nio/.github/workflows/benchmarks.yml@android-sdk with: benchmark_package_path: "Benchmarks" @@ -45,7 +45,7 @@ jobs: with: persist-credentials: false - id: generate-matrix - run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" + run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq" MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh" @@ -54,7 +54,7 @@ jobs: name: Integration tests needs: construct-integration-test-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Integration tests" matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}' @@ -62,26 +62,26 @@ jobs: static-sdk: name: Static Linux Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@main + uses: apple/swift-nio/.github/workflows/static_sdk.yml@android-sdk wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main + uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@android-sdk with: additional_command_arguments: "--target NIOCore" android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_sdk.yml@main + uses: apple/swift-nio/.github/workflows/android_sdk.yml@android-sdk with: additional_command_arguments: "--target NIOCore" macos-tests: name: macOS tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/macos_tests.yml@main + uses: apple/swift-nio/.github/workflows/macos_tests.yml@android-sdk with: runner_pool: nightly build_scheme: swift-nio-Package @@ -95,4 +95,4 @@ jobs: release-builds: name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@main + uses: apple/swift-nio/.github/workflows/release_builds.yml@android-sdk diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5b1e590eca..95e02e4068 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,7 +19,7 @@ jobs: unit-tests: name: Unit tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/unit_tests.yml@main + uses: apple/swift-nio/.github/workflows/unit_tests.yml@android-sdk with: linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" @@ -31,14 +31,14 @@ jobs: benchmarks: name: Benchmarks # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/benchmarks.yml@main + uses: apple/swift-nio/.github/workflows/benchmarks.yml@android-sdk with: benchmark_package_path: "Benchmarks" cxx-interop: name: Cxx interop # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main + uses: apple/swift-nio/.github/workflows/cxx_interop.yml@android-sdk construct-integration-test-matrix: name: Construct integration test matrix @@ -51,7 +51,7 @@ jobs: with: persist-credentials: false - id: generate-matrix - run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" + run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq" MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh" @@ -60,7 +60,7 @@ jobs: name: Integration tests needs: construct-integration-test-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Integration tests" matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}' @@ -86,7 +86,7 @@ jobs: macos-tests: name: macOS tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/macos_tests.yml@main + uses: apple/swift-nio/.github/workflows/macos_tests.yml@android-sdk with: runner_pool: general build_scheme: swift-nio-Package @@ -96,22 +96,22 @@ jobs: static-sdk: name: Static Linux Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@main + uses: apple/swift-nio/.github/workflows/static_sdk.yml@android-sdk wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main + uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@android-sdk with: additional_command_arguments: "--target NIOCore" android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_sdk.yml@main + uses: apple/swift-nio/.github/workflows/android_sdk.yml@android-sdk with: additional_command_arguments: "--target NIOCore" release-builds: name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@main + uses: apple/swift-nio/.github/workflows/release_builds.yml@android-sdk diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index ff445cdb29..72294877e1 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -137,7 +137,7 @@ jobs: exit 1 fi - echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "swift --version" MATRIX_LINUX_COMMAND: "swift build -c release" @@ -170,7 +170,7 @@ jobs: name: Release builds needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Release builds" matrix_string: '${{ needs.construct-matrix.outputs.release-build-matrix }}' diff --git a/.github/workflows/static_sdk.yml b/.github/workflows/static_sdk.yml index d31e66817d..cf94fdb2d3 100644 --- a/.github/workflows/static_sdk.yml +++ b/.github/workflows/static_sdk.yml @@ -47,7 +47,7 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_VERSION=latest INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_VERSION=latest INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", "command":"swift build", "command_arguments":"${{ inputs.command_arguments }}", "env":'"$env_vars_json"' @@ -58,7 +58,7 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", "command":"swift build", "command_arguments":"${{ inputs.command_arguments }}", "env":'"$env_vars_json"' @@ -71,7 +71,7 @@ jobs: name: Static SDK needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Static SDK" matrix_string: '${{ needs.construct-matrix.outputs.static-sdk-matrix }}' diff --git a/.github/workflows/swift_load_test_matrix.yml b/.github/workflows/swift_load_test_matrix.yml index bb3339b132..f56366ec7f 100644 --- a/.github/workflows/swift_load_test_matrix.yml +++ b/.github/workflows/swift_load_test_matrix.yml @@ -38,7 +38,7 @@ jobs: name: Execute matrix needs: load-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: ${{ inputs.name }} matrix_string: '${{ needs.load-matrix.outputs.swift-matrix }}' diff --git a/.github/workflows/swift_matrix.yml b/.github/workflows/swift_matrix.yml index 31c5320048..c8b2229ac0 100644 --- a/.github/workflows/swift_matrix.yml +++ b/.github/workflows/swift_matrix.yml @@ -168,7 +168,7 @@ jobs: COMMAND_OVERRIDE_NIGHTLY_MAIN: ${{ inputs.matrix_linux_nightly_main_command_override }} run: | apt-get -qq update && apt-get -qq -y install curl - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.sh | bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.sh | bash windows: name: Windows (${{ matrix.swift.swift_version }}) @@ -192,7 +192,7 @@ jobs: persist-credentials: false - name: Donwload matrix script if: ${{ matrix.swift.enabled }} - run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 + run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 - name: Run matrix job if: ${{ matrix.swift.enabled }} run: | @@ -224,7 +224,7 @@ jobs: submodules: true - name: Donwload matrix script if: ${{ matrix.swift.enabled }} - run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 + run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 - name: Run matrix job if: ${{ matrix.swift.enabled }} run: | diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 3e97c81231..8b7d0fb5ca 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -179,7 +179,7 @@ jobs: fi # Generate matrix - echo "unit-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "unit-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "swift --version" MATRIX_LINUX_COMMAND: "swift test" @@ -214,7 +214,7 @@ jobs: name: Unit tests needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "Unit tests" matrix_string: '${{ needs.construct-matrix.outputs.unit-test-matrix }}' diff --git a/.github/workflows/wasm_sdk.yml b/.github/workflows/wasm_sdk.yml index 1508f34428..6c69b22809 100644 --- a/.github/workflows/wasm_sdk.yml +++ b/.github/workflows/wasm_sdk.yml @@ -19,7 +19,7 @@ jobs: wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk with: name: "WebAssembly Swift SDK" matrix_string: >- @@ -31,8 +31,8 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=wasm-sdk bash && hash -r", - "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-wasm-sdk.sh | bash -s --", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=wasm-sdk bash && hash -r", + "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/swift-build-with-wasm-sdk.sh | bash -s --", "command_arguments":"${{ inputs.additional_command_arguments }}", "env":'"$env_vars_json"' } From 4dbda63d4a61d08c151267824aed4796ce42d320 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Wed, 22 Oct 2025 14:59:09 +0100 Subject: [PATCH 3/3] Revert "test shim" This reverts commit 5d41e083da38468b5d1b8030633db33753c4ea59. --- .github/workflows/android_sdk.yml | 6 +++--- .github/workflows/benchmarks.yml | 6 +++--- .github/workflows/cmake_tests.yml | 4 ++-- .github/workflows/cxx_interop.yml | 6 +++--- .github/workflows/main.yml | 20 ++++++++++---------- .github/workflows/pull_request.yml | 20 ++++++++++---------- .github/workflows/release_builds.yml | 4 ++-- .github/workflows/static_sdk.yml | 6 +++--- .github/workflows/swift_load_test_matrix.yml | 2 +- .github/workflows/swift_matrix.yml | 6 +++--- .github/workflows/unit_tests.yml | 4 ++-- .github/workflows/wasm_sdk.yml | 6 +++--- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/android_sdk.yml b/.github/workflows/android_sdk.yml index 15c3981a51..e970a7b908 100644 --- a/.github/workflows/android_sdk.yml +++ b/.github/workflows/android_sdk.yml @@ -19,7 +19,7 @@ jobs: android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Android Swift SDK" matrix_string: >- @@ -31,8 +31,8 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r", - "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/swift-build-with-android-sdk.sh | bash -s --", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=android-sdk bash && hash -r", + "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-android-sdk.sh | bash -s --", "command_arguments":"${{ inputs.additional_command_arguments }}", "env":'"$env_vars_json"' } diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index f70161a551..a89131eb36 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -102,9 +102,9 @@ jobs: exit 1 fi - echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: - MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash" + MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash" MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl libjemalloc-dev && git config --global --add safe.directory /$(basename ${{ github.workspace }})" MATRIX_MIN_SWIFT_VERSION: ${{ inputs.minimum_swift_version }} MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }} @@ -119,7 +119,7 @@ jobs: name: Benchmarks needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Benchmarks" matrix_string: '${{ needs.construct-matrix.outputs.benchmarks-matrix }}' diff --git a/.github/workflows/cmake_tests.yml b/.github/workflows/cmake_tests.yml index d20873e8eb..7a0b80de4e 100644 --- a/.github/workflows/cmake_tests.yml +++ b/.github/workflows/cmake_tests.yml @@ -43,11 +43,11 @@ jobs: which curl jq || apt -q update which curl || apt -yq install curl which jq || apt -yq install jq - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash - name: CMake build run: | which curl cmake ninja || apt -q update which curl || apt -yq install curl which cmake || apt -yq install cmake which ninja || apt -yq install ninja-build - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml index 24b942ddc4..bdce10750e 100644 --- a/.github/workflows/cxx_interop.yml +++ b/.github/workflows/cxx_interop.yml @@ -105,9 +105,9 @@ jobs: exit 1 fi - echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: - MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-cxx-interop-compatibility.sh | bash" + MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash" MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl jq" MATRIX_MIN_SWIFT_VERSION: ${{ inputs.minimum_swift_version }} MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }} @@ -122,7 +122,7 @@ jobs: name: Cxx interop needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Cxx interop" matrix_string: '${{ needs.construct-matrix.outputs.cxx-interop-matrix }}' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c7baf37b6..1c63e64146 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: unit-tests: name: Unit tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/unit_tests.yml@android-sdk + uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" @@ -25,12 +25,12 @@ jobs: cxx-interop: name: Cxx interop # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@android-sdk + uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main benchmarks: name: Benchmarks # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/benchmarks.yml@android-sdk + uses: apple/swift-nio/.github/workflows/benchmarks.yml@main with: benchmark_package_path: "Benchmarks" @@ -45,7 +45,7 @@ jobs: with: persist-credentials: false - id: generate-matrix - run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" + run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq" MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh" @@ -54,7 +54,7 @@ jobs: name: Integration tests needs: construct-integration-test-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Integration tests" matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}' @@ -62,26 +62,26 @@ jobs: static-sdk: name: Static Linux Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/static_sdk.yml@main wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main with: additional_command_arguments: "--target NIOCore" android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/android_sdk.yml@main with: additional_command_arguments: "--target NIOCore" macos-tests: name: macOS tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/macos_tests.yml@android-sdk + uses: apple/swift-nio/.github/workflows/macos_tests.yml@main with: runner_pool: nightly build_scheme: swift-nio-Package @@ -95,4 +95,4 @@ jobs: release-builds: name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@android-sdk + uses: apple/swift-nio/.github/workflows/release_builds.yml@main diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 95e02e4068..5b1e590eca 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,7 +19,7 @@ jobs: unit-tests: name: Unit tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/unit_tests.yml@android-sdk + uses: apple/swift-nio/.github/workflows/unit_tests.yml@main with: linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error" @@ -31,14 +31,14 @@ jobs: benchmarks: name: Benchmarks # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/benchmarks.yml@android-sdk + uses: apple/swift-nio/.github/workflows/benchmarks.yml@main with: benchmark_package_path: "Benchmarks" cxx-interop: name: Cxx interop # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/cxx_interop.yml@android-sdk + uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main construct-integration-test-matrix: name: Construct integration test matrix @@ -51,7 +51,7 @@ jobs: with: persist-credentials: false - id: generate-matrix - run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" + run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq" MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh" @@ -60,7 +60,7 @@ jobs: name: Integration tests needs: construct-integration-test-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Integration tests" matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}' @@ -86,7 +86,7 @@ jobs: macos-tests: name: macOS tests # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/macos_tests.yml@android-sdk + uses: apple/swift-nio/.github/workflows/macos_tests.yml@main with: runner_pool: general build_scheme: swift-nio-Package @@ -96,22 +96,22 @@ jobs: static-sdk: name: Static Linux Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/static_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/static_sdk.yml@main wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main with: additional_command_arguments: "--target NIOCore" android-sdk: name: Android Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/android_sdk.yml@android-sdk + uses: apple/swift-nio/.github/workflows/android_sdk.yml@main with: additional_command_arguments: "--target NIOCore" release-builds: name: Release builds - uses: apple/swift-nio/.github/workflows/release_builds.yml@android-sdk + uses: apple/swift-nio/.github/workflows/release_builds.yml@main diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index 72294877e1..ff445cdb29 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -137,7 +137,7 @@ jobs: exit 1 fi - echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "swift --version" MATRIX_LINUX_COMMAND: "swift build -c release" @@ -170,7 +170,7 @@ jobs: name: Release builds needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Release builds" matrix_string: '${{ needs.construct-matrix.outputs.release-build-matrix }}' diff --git a/.github/workflows/static_sdk.yml b/.github/workflows/static_sdk.yml index cf94fdb2d3..d31e66817d 100644 --- a/.github/workflows/static_sdk.yml +++ b/.github/workflows/static_sdk.yml @@ -47,7 +47,7 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_VERSION=latest INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_VERSION=latest INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", "command":"swift build", "command_arguments":"${{ inputs.command_arguments }}", "env":'"$env_vars_json"' @@ -58,7 +58,7 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 bash && hash -r", "command":"swift build", "command_arguments":"${{ inputs.command_arguments }}", "env":'"$env_vars_json"' @@ -71,7 +71,7 @@ jobs: name: Static SDK needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Static SDK" matrix_string: '${{ needs.construct-matrix.outputs.static-sdk-matrix }}' diff --git a/.github/workflows/swift_load_test_matrix.yml b/.github/workflows/swift_load_test_matrix.yml index f56366ec7f..bb3339b132 100644 --- a/.github/workflows/swift_load_test_matrix.yml +++ b/.github/workflows/swift_load_test_matrix.yml @@ -38,7 +38,7 @@ jobs: name: Execute matrix needs: load-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: ${{ inputs.name }} matrix_string: '${{ needs.load-matrix.outputs.swift-matrix }}' diff --git a/.github/workflows/swift_matrix.yml b/.github/workflows/swift_matrix.yml index c8b2229ac0..31c5320048 100644 --- a/.github/workflows/swift_matrix.yml +++ b/.github/workflows/swift_matrix.yml @@ -168,7 +168,7 @@ jobs: COMMAND_OVERRIDE_NIGHTLY_MAIN: ${{ inputs.matrix_linux_nightly_main_command_override }} run: | apt-get -qq update && apt-get -qq -y install curl - curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.sh | bash + curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.sh | bash windows: name: Windows (${{ matrix.swift.swift_version }}) @@ -192,7 +192,7 @@ jobs: persist-credentials: false - name: Donwload matrix script if: ${{ matrix.swift.enabled }} - run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 + run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 - name: Run matrix job if: ${{ matrix.swift.enabled }} run: | @@ -224,7 +224,7 @@ jobs: submodules: true - name: Donwload matrix script if: ${{ matrix.swift.enabled }} - run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 + run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1 - name: Run matrix job if: ${{ matrix.swift.enabled }} run: | diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 8b7d0fb5ca..3e97c81231 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -179,7 +179,7 @@ jobs: fi # Generate matrix - echo "unit-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" + echo "unit-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT" env: MATRIX_LINUX_SETUP_COMMAND: "swift --version" MATRIX_LINUX_COMMAND: "swift test" @@ -214,7 +214,7 @@ jobs: name: Unit tests needs: construct-matrix # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "Unit tests" matrix_string: '${{ needs.construct-matrix.outputs.unit-test-matrix }}' diff --git a/.github/workflows/wasm_sdk.yml b/.github/workflows/wasm_sdk.yml index 6c69b22809..1508f34428 100644 --- a/.github/workflows/wasm_sdk.yml +++ b/.github/workflows/wasm_sdk.yml @@ -19,7 +19,7 @@ jobs: wasm-sdk: name: WebAssembly Swift SDK # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@android-sdk + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: name: "WebAssembly Swift SDK" matrix_string: >- @@ -31,8 +31,8 @@ jobs: "platform":"Linux", "runner":"ubuntu-latest", "image":"ubuntu:jammy", - "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=wasm-sdk bash && hash -r", - "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/android-sdk/scripts/swift-build-with-wasm-sdk.sh | bash -s --", + "setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_sdk.sh | INSTALL_SWIFT_BRANCH=main INSTALL_SWIFT_ARCH=x86_64 INSTALL_SWIFT_SDK=wasm-sdk bash && hash -r", + "command":"curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/swift-build-with-wasm-sdk.sh | bash -s --", "command_arguments":"${{ inputs.additional_command_arguments }}", "env":'"$env_vars_json"' }