From da6efa38277fb96d1e1a53ad0447fae790980623 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Mon, 10 Mar 2025 13:20:42 +0000 Subject: [PATCH 1/3] Update main.yml integration tests to use swift_test_matrix Update main.yml integration tests to use `swift_test_matrix` as has been done on the PR workflow. This brings it off the deprecated workflow and should fix the nightly-6.1 issue --- .github/workflows/main.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4e84d50..987f6d1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,10 +28,26 @@ jobs: name: "HTTP/2 spec tests" matrix_linux_command: "apt-get update -y -q && apt-get install -y -q wget lsof && mkdir $HOME/.tools && wget -q https://github.com/summerwind/h2spec/releases/download/v2.2.1/h2spec_linux_amd64.tar.gz -O $HOME/.tools/h2spec.tar.gz && tar xzf $HOME/.tools/h2spec.tar.gz --directory $HOME/.tools && PATH=${PATH}:$HOME/.tools && ./scripts/test_h2spec.sh" + construct-integration-tests-matrix: + name: Construct Examples matrix + runs-on: ubuntu-latest + outputs: + integration-tests-matrix: '${{ steps.generate-matrix.outputs.integration-tests-matrix }}' + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + persist-credentials: false + - id: generate-matrix + run: echo "integration-tests-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT" + env: + MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh" + MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q jq" + integration-tests: name: Integration Tests - # Workaround https://github.com/nektos/act/issues/1875 - uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main + needs: construct-integration-tests-matrix + uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: - name: "Integration tests" - matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && ./scripts/integration_tests.sh" + name: "Examples" + matrix_string: '${{ needs.construct-integration-tests-matrix.outputs.integration-tests-matrix }}' From 82c83ad390248e287bc3fd9726c7c89e0515d05f Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Mon, 10 Mar 2025 13:21:36 +0000 Subject: [PATCH 2/3] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 987f6d1e..260c06ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,5 +49,5 @@ jobs: needs: construct-integration-tests-matrix uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main with: - name: "Examples" + name: "Integration tests" matrix_string: '${{ needs.construct-integration-tests-matrix.outputs.integration-tests-matrix }}' From 127233642b7927081b5ca78a1f4e2a23c660555a Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Fri, 14 Mar 2025 10:03:21 +0000 Subject: [PATCH 3/3] Update .github/workflows/main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 260c06ed..d254c472 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: name: "HTTP/2 spec tests" matrix_linux_command: "apt-get update -y -q && apt-get install -y -q wget lsof && mkdir $HOME/.tools && wget -q https://github.com/summerwind/h2spec/releases/download/v2.2.1/h2spec_linux_amd64.tar.gz -O $HOME/.tools/h2spec.tar.gz && tar xzf $HOME/.tools/h2spec.tar.gz --directory $HOME/.tools && PATH=${PATH}:$HOME/.tools && ./scripts/test_h2spec.sh" - construct-integration-tests-matrix: + construct-integration-tests-matrix: name: Construct Examples matrix runs-on: ubuntu-latest outputs: