From 7a321b84e857169aa7e231d80003f24a4f54e2be Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Tue, 24 Dec 2024 15:36:29 +0000 Subject: [PATCH] WIP: use new matrix --- .github/workflows/matrices/plugin-tests.json | 1 + .github/workflows/pull_request.yml | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/matrices/plugin-tests.json diff --git a/.github/workflows/matrices/plugin-tests.json b/.github/workflows/matrices/plugin-tests.json new file mode 100644 index 0000000..3558d5a --- /dev/null +++ b/.github/workflows/matrices/plugin-tests.json @@ -0,0 +1 @@ +{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl","command":"curl -s https://raw.githubusercontent.com/rnro/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-6.0)","swift_version":"nightly-6.0","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl","command":"curl -s https://raw.githubusercontent.com/rnro/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl","command":"curl -s https://raw.githubusercontent.com/rnro/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""}]} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2c55fa8..29c7ce8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -28,12 +28,10 @@ jobs: plugin-tests: name: Plugin tests - uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main + uses: apple/swift-nio/.github/workflows/swift_load_test_matrix.yml@main with: name: "Plugin tests" - matrix_linux_5_9_enabled: false - matrix_linux_5_10_enabled: false - matrix_linux_command: "./dev/plugin-tests.sh" + matrix_path: ".github/workflows/matrices/plugin-tests.json" cxx-interop: name: Cxx interop