Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the protoc build plugin in examples #2171

Merged
merged 12 commits into from
Jan 22, 2025
Merged

Use the protoc build plugin in examples #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
695ed89
Use the protoc build plugin in examples
glbrntt Jan 22, 2025
137cc64
Use plugin: error-details
glbrntt Jan 22, 2025
8826eb0
Use plugin: hello-world
glbrntt Jan 22, 2025
5294f67
Use plugin: reflection-server
glbrntt Jan 22, 2025
0bf8afe
Use plugin: route-guide
glbrntt Jan 22, 2025
d27aa82
Stop generating
glbrntt Jan 22, 2025
38ab808
Install protoc
glbrntt Jan 22, 2025
671bcc1
Update config
glbrntt Jan 22, 2025
71e62fb
fix hello world
glbrntt Jan 22, 2025
cc1783b
Merge branch 'main' into v2/use-plugin-for-examples
glbrntt Jan 22, 2025
97f7e97
Merge branch 'main' into v2/use-plugin-for-examples
glbrntt Jan 22, 2025
33fa1e1
Fix some manifests
glbrntt Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
MATRIX_LINUX_5_9_ENABLED: false
MATRIX_LINUX_5_10_ENABLED: false
MATRIX_LINUX_COMMAND: "./dev/build-examples.sh"
MATRIX_LINUX_SETUP_COMMAND: ""
MATRIX_LINUX_SETUP_COMMAND: "apt update && apt install -y protobuf-compiler && ./dev/build-examples.sh"

examples-matrix:
name: Examples
Expand Down
9 changes: 6 additions & 3 deletions Examples/echo/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", branch: "main"),
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", branch: "main"),
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
],
targets: [
Expand All @@ -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")
]
)
]
Expand Down
994 changes: 0 additions & 994 deletions Examples/echo/Sources/Generated/echo.grpc.swift
View file
Open in desktop

This file was deleted.

129 changes: 0 additions & 129 deletions Examples/echo/Sources/Generated/echo.pb.swift
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Examples/echo/Sources/Protos/echo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../dev/protos/examples/echo/
7 changes: 7 additions & 0 deletions Examples/echo/Sources/Protos/grpc-swift-proto-generator-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"generate": {
"clients": true,
"servers": true,
"messages": true
}
}
7 changes: 5 additions & 2 deletions Examples/error-details/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ let package = Package(
name: "error-details",
platforms: [.macOS(.v15)],
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.git", branch: "main"),
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
],
targets: [
.executableTarget(
Expand All @@ -31,6 +31,9 @@ let package = Package(
.product(name: "GRPCCore", package: "grpc-swift"),
.product(name: "GRPCInProcessTransport", package: "grpc-swift"),
.product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
],
plugins: [
.plugin(name: "GRPCProtobufGenerator", package: "grpc-swift-protobuf")
]
)
]
Expand Down
Loading
Loading