Merge branch 'main' into 6_1_nightly_ci

Author: rnro

.github/workflows/pull_request.yml

@@ -26,14 +26,31 @@ jobs:
       linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
 
-  examples:
+  construct-examples-matrix:
+    name: Construct Examples matrix
+    runs-on: ubuntu-latest
+    outputs:
+      examples-matrix: '${{ steps.generate-matrix.outputs.examples-matrix }}'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - id: generate-matrix
+        run: echo "examples-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
+        env:
+          MATRIX_LINUX_5_9_ENABLED: false
+          MATRIX_LINUX_5_10_ENABLED: false
+          MATRIX_LINUX_COMMAND: "./dev/build-examples.sh"
+          MATRIX_LINUX_SETUP_COMMAND: "apt update && apt install -y protobuf-compiler && ./dev/build-examples.sh"
+
+  examples-matrix:
     name: Examples
-    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    needs: construct-examples-matrix
+    uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
     with:
       name: "Examples"
-      matrix_linux_5_9_enabled: false
-      matrix_linux_5_10_enabled: false
-      matrix_linux_command: "./dev/build-examples.sh"
+      matrix_string: '${{ needs.construct-examples-matrix.outputs.examples-matrix }}'
 
   benchmarks:
     name: Benchmarks

Examples/echo/Package.swift

@@ -21,9 +21,9 @@ let package = Package(
   name: "echo",
   platforms: [.macOS("15.0")],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.3"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.3"),
-    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-beta.3"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-rc.1"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-rc.1"),
+    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-rc.1"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
   ],
   targets: [
@@ -34,6 +34,9 @@ let package = Package(
         .product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
         .product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
+      ],
+      plugins: [
+        .plugin(name: "GRPCProtobufGenerator", package: "grpc-swift-protobuf")
       ]
     )
   ]

Examples/echo/README.md

@@ -12,27 +12,36 @@ the four RPC types.
 The tool uses the [SwiftNIO](https://github.com/grpc/grpc-swift-nio-transport)
 HTTP/2 transport.
 
+## Prerequisites
+
+You must have the Protocol Buffers compiler (`protoc`) installed. You can find
+the instructions for doing this in the [gRPC Swift Protobuf documentation][0].
+The `swift` commands below are all prefixed with `PROTOC_PATH=$(which protoc)`,
+this is to let the build system know where `protoc` is located so that it can
+generate stubs for you. You can read more about it in the [gRPC Swift Protobuf
+documentation][1].
+
 ## Usage
 
 Build and run the server using the CLI:
 
 ```console
-$ swift run echo serve
+$ PROTOC_PATH=$(which protoc) swift run echo serve
 Echo listening on [ipv4]127.0.0.1:1234
 ```
 
 Use the CLI to make a unary 'Get' request against it:
 
 ```console
-$ swift run echo get --message "Hello"
+$ PROTOC_PATH=$(which protoc) swift run echo get --message "Hello"
 get → Hello
 get ← Hello
 ```
 
 Use the CLI to make a bidirectional streaming 'Update' request:
 
 ```console
-$ swift run echo update --message "Hello World"
+$ PROTOC_PATH=$(which protoc) swift run echo update --message "Hello World"
 update → Hello
 update → World
 update ← Hello
@@ -42,5 +51,8 @@ update ← World
 Get help with the CLI by running:
 
 ```console
-$ swift run echo --help
+$ PROTOC_PATH=$(which protoc) swift run echo --help
 ```
+
+[0]: https://swiftpackageindex.com/grpc/grpc-swift-protobuf/documentation/grpcprotobuf/installing-protoc
+[1]: https://swiftpackageindex.com/grpc/grpc-swift-protobuf/documentation/grpcprotobuf/generating-stubs