feat: embed protoc in shuttle-proto (#715)

* feat: embed protoc in shuttle-proto * fix: path to shuttle-next in runtime next-resource
shuttle-hq · Mar 15, 2023 · a588e25 · a588e25
1 parent 2ea253a
commit a588e25
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
@@ -22,4 +22,5 @@ workspace = true
 features = ["error", "service", "wasm"]
 
 [build-dependencies]
+protoc-bin-vendored = "3.0.0"
 tonic-build = "0.8.3"
diff --git a/proto/build.rs b/proto/build.rs
@@ -1,4 +1,10 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let protoc = protoc_bin_vendored::protoc_bin_path().unwrap();
+    let protoc_include = protoc_bin_vendored::include_path().unwrap();
+
+    std::env::set_var("PROTOC", protoc);
+    std::env::set_var("PROTOC_INCLUDE", protoc_include);
+
     tonic_build::configure().compile(&["./provisioner.proto", "./runtime.proto"], &["./"])?;
 
     Ok(())

diff --git a/runtime/tests/resources/axum-wasm-expanded/Cargo.toml b/runtime/tests/resources/axum-wasm-expanded/Cargo.toml
@@ -10,5 +10,5 @@ crate-type = [ "cdylib" ]
 
 [dependencies]
 futures = "0.3.25"
-shuttle-next = { path = "../../../../next" }
+shuttle-next = { path = "../../../../services/shuttle-next" }
 tracing = "0.1.37"