Skip to content

Commit e82f5e0

Browse files
authored
Vendor protoc for sqlite watcher (#91)
* [sync-sqlite] add watcher client and incremental command * [docs/packaging] add watcher crate, release artifacts, and smoke test * chore(docs): move sqlite docs under sqlite-watcher-docs * fix(ci): replace unmaintained deps for security audit * Vendor protoc for sqlite-watcher build * Add PR body for vendored protoc fix
1 parent d182164 commit e82f5e0

File tree

4 files changed

+82
-7
lines changed

4 files changed

+82
-7
lines changed

Cargo.lock

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

PR_BODY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Summary
2-
- fix sqlite sync change-state handling by treating watcher wal_frame/cursor fields as optional strings and cleaning up unused code
3-
- implement FromStr for sqlite ChangeOperation and resolve needless borrow lints in queue/server modules
4-
- keep clippy happy by applying the suggested clamp change and ensuring proto tests build
2+
- vendor `protoc` via `protoc-bin-vendored` so sqlite-watcher can build on runners without system protobuf
3+
- update build script to set `PROTOC` before invoking `tonic_build`
4+
- refresh Cargo.lock to capture the new dependencies
55

66
## Testing
77
- cargo clippy

sqlite-watcher/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build = "build.rs"
1010

1111
[build-dependencies]
1212
tonic-build = "0.11"
13+
protoc-bin-vendored = "3"
1314

1415
[dependencies]
1516
anyhow = "1.0"

sqlite-watcher/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
fn main() -> Result<(), Box<dyn std::error::Error>> {
2+
let protoc = protoc_bin_vendored::protoc_bin_path()?;
3+
std::env::set_var("PROTOC", protoc);
24
tonic_build::configure()
35
.build_client(true)
46
.build_server(true)

0 commit comments

Comments
 (0)