Skip to content

Commit 6c3f38a

Browse files
committed
CI generate plugin test matrix
1 parent b8e1d21 commit 6c3f38a

File tree

4 files changed

+45
-8
lines changed

4 files changed

+45
-8
lines changed

.github/workflows/main.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,28 @@ jobs:
1717
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1818
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1919

20-
plugin-tests:
20+
construct-plugin-tests-matrix:
21+
name: Construct plugin tests matrix
22+
runs-on: ubuntu-latest
23+
outputs:
24+
plugin-tests-matrix: '${{ steps.generate-matrix.outputs.plugin-tests-matrix }}'
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v4
28+
with:
29+
persist-credentials: false
30+
- id: generate-matrix
31+
run: echo "plugin-tests-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
32+
env:
33+
MATRIX_LINUX_5_9_ENABLED: false
34+
MATRIX_LINUX_5_10_ENABLED: false
35+
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/rnro/grpc-swift-protobuf/refs/heads/build_plugin_integration_tests/dev/plugin-tests.sh | GITHUB_ACTIONS=true bash"
36+
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q curl protobuf-compiler"
37+
38+
plugin-tests-matrix:
2139
name: Plugin tests
22-
uses: apple/swift-nio/.github/workflows/swift_load_test_matrix.yml@main
40+
needs: construct-plugin-tests-matrix
41+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
2342
with:
2443
name: "Plugin tests"
25-
matrix_path: ".github/workflows/matrices/plugin-tests.json"
44+
matrix_string: '${{ needs.construct-plugin-tests-matrix.outputs.plugin-tests-matrix }}'

.github/workflows/matrices/plugin-tests.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/pull_request.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,31 @@ jobs:
2626
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2727
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2828

29-
plugin-tests:
29+
construct-plugin-tests-matrix:
30+
name: Construct plugin tests matrix
31+
runs-on: ubuntu-latest
32+
outputs:
33+
plugin-tests-matrix: '${{ steps.generate-matrix.outputs.plugin-tests-matrix }}'
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v4
37+
with:
38+
persist-credentials: false
39+
- id: generate-matrix
40+
run: echo "plugin-tests-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
41+
env:
42+
MATRIX_LINUX_5_9_ENABLED: false
43+
MATRIX_LINUX_5_10_ENABLED: false
44+
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/rnro/grpc-swift-protobuf/refs/heads/build_plugin_integration_tests/dev/plugin-tests.sh | GITHUB_ACTIONS=true bash"
45+
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q curl protobuf-compiler"
46+
47+
plugin-tests-matrix:
3048
name: Plugin tests
31-
uses: apple/swift-nio/.github/workflows/swift_load_test_matrix.yml@main
49+
needs: construct-plugin-tests-matrix
50+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
3251
with:
3352
name: "Plugin tests"
34-
matrix_path: ".github/workflows/matrices/plugin-tests.json"
53+
matrix_string: '${{ needs.construct-plugin-tests-matrix.outputs.plugin-tests-matrix }}'
3554

3655
cxx-interop:
3756
name: Cxx interop

IntegrationTests/PluginTests/Resources/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import PackageDescription
1919

20-
var package = Package(
20+
let package = Package(
2121
name: "grpc-adopter",
2222
platforms: [
2323
.macOS(.v15),

0 commit comments

Comments
 (0)