Skip to content

Commit b886c96

Browse files
committed
migrate cxx interop
1 parent 94f3358 commit b886c96

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

.github/workflows/pull_request.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,26 @@ jobs:
2222
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error"
2323
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2424

25+
construct-cxx-matrix:
26+
name: Construct Cxx interop matrix
27+
runs-on: ubuntu-latest
28+
outputs:
29+
cxx-interop-matrix: '${{ steps.generate-matrix.outputs.cxx-interop-matrix }}'
30+
steps:
31+
- name: Checkout repository
32+
uses: actions/checkout@v4
33+
with:
34+
persist-credentials: false
35+
- id: generate-matrix
36+
run: echo "cxx-interop-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
37+
env:
38+
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
39+
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q curl jq libsasl2-dev"
40+
2541
cxx-interop:
2642
name: Cxx interop
27-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
43+
needs: construct-cxx-matrix
44+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
2845
with:
2946
name: "Cxx interop"
30-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && apt-get -y install libsasl2-dev && curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
31-
matrix_linux_5_9_enabled: true
32-
matrix_linux_5_10_enabled: true
33-
matrix_linux_6_0_enabled: true
34-
matrix_linux_nightly_6_1_enabled: true
35-
matrix_linux_nightly_main_enabled: true
47+
matrix_string: '${{ needs.construct-cxx-matrix.outputs.cxx-interop-matrix }}'

0 commit comments

Comments
 (0)