Skip to content

Commit c60f4ee

Browse files
fix: patch proto to latest + update script (#953)
Update protobuf-codegen and protobuff to latest (3.7.1) #### Migration notes --- - [ ] The change comes with new or modified tests - [ ] Hard-to-understand functions have explanatory comments - [ ] End-user documentation is updated to reflect the change <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes - **Dependency Updates** - Updated `protobuf` library from version 3.5.1 to 3.7.1 - Updated `protobuf-codegen` crate to version 3.7.1 - **Build Configuration** - Modified protobuf compiler output option from `--rust_out` to `--rs_out` - Simplified protobuf code generation command - **Compatibility** - Ensured compatibility with latest protobuf runtime version <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 8c0022e commit c60f4ee

File tree

6 files changed

+57
-21
lines changed

6 files changed

+57
-21
lines changed

.ghjk/lock.json

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,41 @@
730730
"buildDepConfigs": {},
731731
"portRef": "[email protected]",
732732
"specifiedVersion": true
733+
},
734+
"bciqn2ct4mwrwyise3qlnabpine33dzt3lvnrhrbnkw4pnyryfe5is5a": {
735+
"version": "3.7.1",
736+
"buildDepConfigs": {
737+
"cargo_binstall_ghrel": {
738+
"version": "v1.10.9",
739+
"buildDepConfigs": {},
740+
"portRef": "[email protected]",
741+
"specifiedVersion": false
742+
},
743+
"rust_rustup": {
744+
"version": "1.80.1",
745+
"buildDepConfigs": {
746+
"rustup_rustlang": {
747+
"version": "1.27.1",
748+
"buildDepConfigs": {
749+
"git_aa": {
750+
"version": "2.34.1",
751+
"buildDepConfigs": {},
752+
"portRef": "[email protected]",
753+
"specifiedVersion": false
754+
}
755+
},
756+
"portRef": "[email protected]",
757+
"specifiedVersion": false
758+
}
759+
},
760+
"portRef": "[email protected]",
761+
"profile": "minimal",
762+
"specifiedVersion": true
763+
}
764+
},
765+
"portRef": "[email protected]",
766+
"crateName": "protobuf-codegen",
767+
"specifiedVersion": true
733768
}
734769
}
735770
},
@@ -853,7 +888,7 @@
853888
},
854889
"ghjkEnvProvInstSet_______task_env_gen-subs-protoc": {
855890
"installs": [
856-
"bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy",
891+
"bciqifvrtbr5a6nomogpnbn7jxwscqpepdgh67lrsjpkh6t2odnjrnma",
857892
"bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy",
858893
"bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y",
859894
"bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a"
@@ -3049,8 +3084,8 @@
30493084
},
30503085
"packageName": "@bytecodealliance/jco"
30513086
},
3052-
"bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy": {
3053-
"version": "3.5.1",
3087+
"bciqifvrtbr5a6nomogpnbn7jxwscqpepdgh67lrsjpkh6t2odnjrnma": {
3088+
"version": "3.7.1",
30543089
"port": {
30553090
"ty": "denoWorker@v1",
30563091
"name": "cargobi_cratesio",

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/substantial/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ serde.workspace = true
1010
serde_json.workspace = true
1111
uuid.workspace = true
1212

13-
protobuf = "3.6.0"
13+
protobuf = "3.7.1"
1414
# pinned due to url
1515
redis = "=0.25.4"

src/substantial/src/protocol/events.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// This file is generated by rust-protobuf 3.5.1. Do not edit
2-
// .proto file is parsed by protoc --rust_out=...
1+
// This file is generated by rust-protobuf 3.7.1. Do not edit
2+
// .proto file is parsed by protoc --rs_out=...
33
// @generated
44

55
// https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,7 +22,7 @@
2222
2323
/// Generated files are compatible only with the same version
2424
/// of protobuf runtime.
25-
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0;
25+
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1;
2626

2727
// @@protoc_insertion_point(message:substantial.protos.events.Start)
2828
#[derive(PartialEq,Clone,Default,Debug)]

src/substantial/src/protocol/metadata.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// This file is generated by rust-protobuf 3.5.1. Do not edit
2-
// .proto file is parsed by protoc --rust_out=...
1+
// This file is generated by rust-protobuf 3.7.1. Do not edit
2+
// .proto file is parsed by protoc --rs_out=...
33
// @generated
44

55
// https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,7 +22,7 @@
2222
2323
/// Generated files are compatible only with the same version
2424
/// of protobuf runtime.
25-
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0;
25+
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1;
2626

2727
// @@protoc_insertion_point(message:substantial.protos.metadata.Info)
2828
#[derive(PartialEq,Clone,Default,Debug)]

tools/tasks/gen.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ export default {
1919
workingDir: "src/substantial",
2020
inherit: "_rust",
2121
installs: [
22-
ports.cargobi({ crateName: "protobuf-codegen", version: "3.5.1" }),
22+
ports.cargobi({ crateName: "protobuf-codegen", version: "3.7.1" }),
2323
],
2424
fn: ($) => {
2525
// https://github.com/protocolbuffers/protobuf/issues/13346
2626
const protoFiles = [
2727
"protocol/events.proto",
2828
"protocol/metadata.proto",
2929
];
30-
return $`protoc --proto_path=. ${protoFiles} --rust_out=src/protocol --rust_opt=experimental-codegen=enabled,kernel=cpp`;
30+
31+
return $`protoc --proto_path=. ${protoFiles} --rs_out=src/protocol`;
3132
},
3233
},
3334
} satisfies Record<string, DenoTaskDefArgs>;

0 commit comments

Comments
 (0)