Skip to content

Commit

Permalink
Fix nightly Rust build of prost
Browse files Browse the repository at this point in the history
by going back to upstream prost version

error: failed to load source for dependency `prost`

Caused by:
  Unable to update https://github.com/MaterializeInc/prost#17cc373b

Caused by:
  failed to update submodule `prost-build/third-party/protobuf`

Caused by:
  failed to parse url for submodule `prost-build/third-party/protobuf`: `git@github.com:protocolbuffers/protobuf`

Caused by:
  relative URL without a base
  • Loading branch information
def- committed Jun 20, 2023
1 parent 0e21be6 commit bc0d5c3
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 26 deletions.
50 changes: 39 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,6 @@ serde-value = { git = "https://github.com/MaterializeInc/serde-value.git" }
# dependency on arrayvec v0.5.2 via a dependency on vte v0.10.1.
vte = { git = "https://github.com/MaterializeInc/vte", rev = "45670c47cebd7af050def2f80a307bdeec7caba3" }

# Waiting on https://github.com/tokio-rs/prost/pull/833 to make it into a
# release.
prost = { git = "https://github.com/MaterializeInc/prost" }
prost-build = { git = "https://github.com/MaterializeInc/prost" }
prost-derive = { git = "https://github.com/MaterializeInc/prost" }
prost-types = { git = "https://github.com/MaterializeInc/prost" }

# Waiting on https://github.com/hyperium/tonic/pull/1398.
tonic-build = { git = "https://github.com/MaterializeInc/tonic" }

Expand Down
2 changes: 1 addition & 1 deletion src/interchange/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mz-ore = { path = "../ore", features = ["network"] }
mz-repr = { path = "../repr" }
ordered-float = { version = "3.4.0", features = ["serde"] }
prost = { version = "0.11.3", features = ["no-recursion-limit"] }
prost-reflect = "0.9.2"
prost-reflect = "0.11.4"
serde_json = "1.0.89"
timely = { version = "0.12.0", default-features = false, features = ["bincode"] }
tokio = { version = "1.24.2", features = ["macros", "net", "rt", "rt-multi-thread", "time"] }
Expand Down
2 changes: 1 addition & 1 deletion src/testdrive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mz-sql-parser = { path = "../sql-parser" }
mz-stash = { path = "../stash" }
postgres_array = { version = "0.11.0" }
prost = { version = "0.11.3", features = ["no-recursion-limit"] }
prost-reflect = { version = "0.9.2", features = ["serde"] }
prost-reflect = { version = "0.11.4", features = ["serde"] }
protobuf-src = "1.1.0"
rand = "0.8.5"
rdkafka = { version = "0.29.0", features = ["cmake-build", "ssl-vendored", "libz-static", "zstd"] }
Expand Down
12 changes: 6 additions & 6 deletions src/workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ phf_shared = { version = "0.11.1", features = ["uncased"] }
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] }
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
proc-macro2 = { version = "1.0.59", features = ["span-locations"] }
prost = { git = "https://github.com/MaterializeInc/prost", features = ["no-recursion-limit"] }
prost-reflect = { version = "0.9.2", default-features = false, features = ["serde"] }
prost-types = { git = "https://github.com/MaterializeInc/prost" }
prost = { version = "0.11.9", features = ["no-recursion-limit"] }
prost-reflect = { version = "0.11.4", default-features = false, features = ["serde"] }
prost-types = { version = "0.11.9" }
quote = { version = "1.0.28" }
rand = { version = "0.8.5", features = ["small_rng"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features = ["cmake-build", "libz-static", "ssl-vendored", "zstd"] }
Expand Down Expand Up @@ -175,9 +175,9 @@ phf_shared = { version = "0.11.1", features = ["uncased"] }
postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] }
postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
proc-macro2 = { version = "1.0.59", features = ["span-locations"] }
prost = { git = "https://github.com/MaterializeInc/prost", features = ["no-recursion-limit"] }
prost-reflect = { version = "0.9.2", default-features = false, features = ["serde"] }
prost-types = { git = "https://github.com/MaterializeInc/prost" }
prost = { version = "0.11.9", features = ["no-recursion-limit"] }
prost-reflect = { version = "0.11.4", default-features = false, features = ["serde"] }
prost-types = { version = "0.11.9" }
quote = { version = "1.0.28" }
rand = { version = "0.8.5", features = ["small_rng"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features = ["cmake-build", "libz-static", "ssl-vendored", "zstd"] }
Expand Down

0 comments on commit bc0d5c3

Please sign in to comment.