Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ jobs:
# /usr/local/include) so the checked-in code is pinned to a
# specific proto source, not whatever protoc version ships.
protoc --descriptor_set_out=/tmp/wkt.pb --include_imports \
--include_source_info \
-I buffa-types/protos \
google/protobuf/any.proto \
google/protobuf/duration.proto \
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ tasks:
Requires protoc on PATH.
cmds:
- >-
protoc --descriptor_set_out=/tmp/wkt.pb --include_imports
protoc --descriptor_set_out=/tmp/wkt.pb --include_imports --include_source_info
-I buffa-types/protos
google/protobuf/any.proto
google/protobuf/duration.proto
Expand Down
4 changes: 4 additions & 0 deletions buffa-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ fn invoke_protoc(

let mut cmd = Command::new(&protoc);
cmd.arg("--include_imports");
cmd.arg("--include_source_info");
cmd.arg(format!(
"--descriptor_set_out={}",
descriptor_path.display()
Expand Down Expand Up @@ -555,6 +556,9 @@ fn invoke_protoc(
/// module-root-relative; passing user paths to both would be a contradiction.
/// Codegen filtering happens on our side via `files_to_generate` matching.
fn invoke_buf() -> Result<Vec<u8>, Box<dyn std::error::Error>> {
// buf build includes SourceCodeInfo by default (there's an
// --exclude-source-info flag to disable it), so proto comments
// propagate to generated code without an explicit opt-in here.
let output = Command::new("buf")
.arg("build")
.arg("--as-file-descriptor-set")
Expand Down
Loading
Loading