From 89200ec078b730fba9c6cc908501fdd89457b78f Mon Sep 17 00:00:00 2001 From: "riseproject-dev[bot]" <330740410+riseproject-dev[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 08:19:08 +0000 Subject: [PATCH 1/2] databricks-zerobus-ingest-sdk: Add versions 1.8.0, 1.9.0 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> --- docs/packages/databricks-zerobus-ingest-sdk.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/packages/databricks-zerobus-ingest-sdk.yaml b/docs/packages/databricks-zerobus-ingest-sdk.yaml index 5ec2ea200fd..29105805164 100644 --- a/docs/packages/databricks-zerobus-ingest-sdk.yaml +++ b/docs/packages/databricks-zerobus-ingest-sdk.yaml @@ -10,3 +10,5 @@ versions: - filename: databricks_zerobus_ingest_sdk-1.7.0-cp39-abi3-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl sha256: 1217b34793d44fd7494cb195b9217cc3500dfae65186bb3b4bcc40a7a27a1bb7 requires-python: '>=3.9, <3.15' +- version: 1.8.0 +- version: 1.9.0 From b505ffb9b1382f3fe74848819d65447b2a2f6e90 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 28 Sep 2026 12:52:17 +0000 Subject: [PATCH 2/2] databricks-zerobus-ingest-sdk: carry the riscv64 protoc-fallback patch to 1.8.0, 1.9.0 build.rs is unchanged between 1.7.0, 1.8.0 and 1.9.0, so the same fix applies verbatim to both new versions. --- ...-prost-build-s-own-protoc-lookup-on-.patch | 39 +++++++++++++++++++ ...-prost-build-s-own-protoc-lookup-on-.patch | 39 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 patches/databricks-zerobus-ingest-sdk/1.8.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch create mode 100644 patches/databricks-zerobus-ingest-sdk/1.9.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch diff --git a/patches/databricks-zerobus-ingest-sdk/1.8.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch b/patches/databricks-zerobus-ingest-sdk/1.8.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch new file mode 100644 index 00000000000..132aa47a212 --- /dev/null +++ b/patches/databricks-zerobus-ingest-sdk/1.8.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch @@ -0,0 +1,39 @@ +From 480e94a55a71136f815eb19ddf9afb9f0acd32a7 Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Mon, 28 Sep 2026 12:50:23 +0000 +Subject: [PATCH] sdk: fall back to prost-build's own protoc lookup on riscv64 + +Upstream-Status: Inappropriate [protoc-bin-vendored ships no riscv64 binary; prost-build already honours $PROTOC and falls back to protoc on PATH, so only overriding PROTOC when the vendored lookup succeeds is the whole fix] + +protoc_bin_vendored::protoc_bin_path() returns Err on any platform outside +its small enum of prebuilt targets (x86, x86_64, aarch64, ppc64le, s390x, +macOS, Windows), and build.rs unwrap()ed it, panicking before prost-build +ever got a chance to look for a protoc on PATH or via $PROTOC. Only +setting PROTOC when the vendored lookup succeeds restores that fallback, +documented in prost-build's "Sourcing protoc" section. + +Signed-off-by: Ludovic Henry +--- + rust/sdk/build.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/rust/sdk/build.rs b/rust/sdk/build.rs +index 3e080ec..c75eaa9 100644 +--- a/rust/sdk/build.rs ++++ b/rust/sdk/build.rs +@@ -5,7 +5,11 @@ use std::env; + mod zeroparser_proto_build; + + fn main() { +- env::set_var("PROTOC", protoc_bin_vendored::protoc_bin_path().unwrap()); ++ // protoc-bin-vendored ships no riscv64 binary; falling through leaves ++ // prost_build's own PROTOC-env/PATH lookup in charge. ++ if let Ok(protoc) = protoc_bin_vendored::protoc_bin_path() { ++ env::set_var("PROTOC", protoc); ++ } + tonic_prost_build::compile_protos("zerobus_service.proto") + .unwrap_or_else(|e| panic!("Failed to compile protos {:?}", e)); + +-- +2.43.0 + diff --git a/patches/databricks-zerobus-ingest-sdk/1.9.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch b/patches/databricks-zerobus-ingest-sdk/1.9.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch new file mode 100644 index 00000000000..3cec621fcba --- /dev/null +++ b/patches/databricks-zerobus-ingest-sdk/1.9.0/0001-sdk-fall-back-to-prost-build-s-own-protoc-lookup-on-.patch @@ -0,0 +1,39 @@ +From 87f2462219287d68f873d7b3d12b5cd2bce0e47a Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Mon, 28 Sep 2026 12:50:24 +0000 +Subject: [PATCH] sdk: fall back to prost-build's own protoc lookup on riscv64 + +Upstream-Status: Inappropriate [protoc-bin-vendored ships no riscv64 binary; prost-build already honours $PROTOC and falls back to protoc on PATH, so only overriding PROTOC when the vendored lookup succeeds is the whole fix] + +protoc_bin_vendored::protoc_bin_path() returns Err on any platform outside +its small enum of prebuilt targets (x86, x86_64, aarch64, ppc64le, s390x, +macOS, Windows), and build.rs unwrap()ed it, panicking before prost-build +ever got a chance to look for a protoc on PATH or via $PROTOC. Only +setting PROTOC when the vendored lookup succeeds restores that fallback, +documented in prost-build's "Sourcing protoc" section. + +Signed-off-by: Ludovic Henry +--- + rust/sdk/build.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/rust/sdk/build.rs b/rust/sdk/build.rs +index 3e080ec..c75eaa9 100644 +--- a/rust/sdk/build.rs ++++ b/rust/sdk/build.rs +@@ -5,7 +5,11 @@ use std::env; + mod zeroparser_proto_build; + + fn main() { +- env::set_var("PROTOC", protoc_bin_vendored::protoc_bin_path().unwrap()); ++ // protoc-bin-vendored ships no riscv64 binary; falling through leaves ++ // prost_build's own PROTOC-env/PATH lookup in charge. ++ if let Ok(protoc) = protoc_bin_vendored::protoc_bin_path() { ++ env::set_var("PROTOC", protoc); ++ } + tonic_prost_build::compile_protos("zerobus_service.proto") + .unwrap_or_else(|e| panic!("Failed to compile protos {:?}", e)); + +-- +2.43.0 +