Skip to content

Regenerate integration test sources from proto - #189

Merged
glbrntt merged 3 commits into
grpc:mainfrom
samuelmurray:regenerate-from-proto
Jul 29, 2026
Merged

Regenerate integration test sources from proto#189
glbrntt merged 3 commits into
grpc:mainfrom
samuelmurray:regenerate-from-proto

Conversation

@samuelmurray

@samuelmurray samuelmurray commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Now that grpc-swift-protobuf is updated, the generated code differers slightly.

Other changes:

  • Use vendored protoc in script
  • Fetch updates to .proto from upstream
  • Fix broken path to /Generated
  • Add help script to check generated code

Fetch updates to .proto from upstream.
Fix broken path to /Generated directory.
Add help script to check generated code.

# Re-generate everything.
log "Regenerating protos..."
"$here"/protos/generate.sh

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this ought to first run fetch.sh to ensure that upstream is up-to-date?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the other hand, that might be too strict since it would fail builds (if this was part of PR checks) any time the upstream was updated..

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that'd add a little too much noise I think.

@samuelmurray

samuelmurray commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

Pretty sure the failing tests on Linux (nightly main) is unrelated to my changes. Let me know if I should address it here, or if we ignore it.
EDIT: Ah I see now that that check is not required, and that it failed in #189 as well.

@glbrntt glbrntt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!


# Re-generate everything.
log "Regenerating protos..."
"$here"/protos/generate.sh

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that'd add a little too much noise I think.

@glbrntt glbrntt added the semver/none No version bump required. label Jul 29, 2026
@glbrntt
glbrntt enabled auto-merge (squash) July 29, 2026 05:54
@glbrntt
glbrntt merged commit c46f77c into grpc:main Jul 29, 2026
77 of 81 checks passed
@samuelmurray
samuelmurray deleted the regenerate-from-proto branch July 29, 2026 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

semver/none No version bump required.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants