Skip to content

Commit b46cdf0

Browse files
authored
Update main.yml integration tests to use swift_test_matrix (#499)
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
1 parent 84076bb commit b46cdf0

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

.github/workflows/main.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,26 @@ jobs:
2828
name: "HTTP/2 spec tests"
2929
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"
3030

31+
construct-integration-tests-matrix:
32+
name: Construct Examples matrix
33+
runs-on: ubuntu-latest
34+
outputs:
35+
integration-tests-matrix: '${{ steps.generate-matrix.outputs.integration-tests-matrix }}'
36+
steps:
37+
- name: Checkout repository
38+
uses: actions/checkout@v4
39+
with:
40+
persist-credentials: false
41+
- id: generate-matrix
42+
run: echo "integration-tests-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
43+
env:
44+
MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
45+
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q jq"
46+
3147
integration-tests:
3248
name: Integration Tests
33-
# Workaround https://github.com/nektos/act/issues/1875
34-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
49+
needs: construct-integration-tests-matrix
50+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
3551
with:
3652
name: "Integration tests"
37-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && ./scripts/integration_tests.sh"
53+
matrix_string: '${{ needs.construct-integration-tests-matrix.outputs.integration-tests-matrix }}'

0 commit comments

Comments
 (0)