Skip to content

Commit 115d0d0

Browse files
committed
deps: Update rules_rust to v0.56.0, wasmtime to v25.0.3
I was unable to update wasmtime past v25.0.3. I will file an issue describing the failure. Signed-off-by: Matt Leon <[email protected]>
1 parent 50f35a3 commit 115d0d0

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Disable Bzlmod
22
common --noenable_bzlmod
33

4+
# Work around https://github.com/bazelbuild/rules_rust/issues/2665
5+
common --incompatible_merge_fixed_and_default_shell_env
6+
47
# Pass CC, CXX and PATH from the environment.
58
build --action_env=CC
69
build --action_env=CXX

bazel/dependencies.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ def proxy_wasm_cpp_host_dependencies():
3737
extra_target_triples = [
3838
"aarch64-unknown-linux-gnu",
3939
"wasm32-unknown-unknown",
40-
"wasm32-wasi", # TODO: Change to wasm32-wasip1 once https://github.com/bazelbuild/rules_rust/issues/2782 is fixed
40+
"wasm32-wasip1",
4141
],
42-
version = "1.77.2",
42+
versions = ["1.81.0"],
4343
)
4444
rust_repository_set(
4545
name = "rust_linux_s390x",
4646
exec_triple = "s390x-unknown-linux-gnu",
4747
extra_target_triples = [
4848
"wasm32-unknown-unknown",
49-
"wasm32-wasi",
49+
"wasm32-wasip1",
5050
],
51-
version = "1.77.2",
51+
versions = ["1.81.0"],
5252
)
5353
crate_universe_dependencies(bootstrap = True)
5454

bazel/repositories.bzl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,12 @@ def proxy_wasm_cpp_host_repositories():
9090
url = "https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
9191
)
9292

93-
# Keep at 0.42 one because https://github.com/bazelbuild/rules_rust/issues/2665
94-
# manifests at 0.43
9593
maybe(
9694
http_archive,
9795
name = "rules_rust",
98-
integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=",
96+
sha256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64",
9997
# NOTE: Update Rust version in bazel/dependencies.bzl.
100-
url = "https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz",
98+
url = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/rules_rust-0.56.0.tar.gz",
10199
patches = ["@proxy_wasm_cpp_host//bazel/external:rules_rust.patch"],
102100
patch_args = ["-p1"],
103101
)
@@ -257,9 +255,9 @@ def proxy_wasm_cpp_host_repositories():
257255
http_archive,
258256
name = "com_github_bytecodealliance_wasmtime",
259257
build_file = "@proxy_wasm_cpp_host//bazel/external:wasmtime.BUILD",
260-
sha256 = "2ccb49bb3bfa4d86907ad4c80d1147aef6156c7b6e3f7f14ed02a39de9761155",
261-
strip_prefix = "wasmtime-24.0.0",
262-
url = "https://github.com/bytecodealliance/wasmtime/archive/v24.0.0.tar.gz",
258+
sha256 = "17850ca356fce6ea8bcd3847692b3233588ddf32ff31fcccac67ad06bcac0a3a",
259+
strip_prefix = "wasmtime-25.0.3",
260+
url = "https://github.com/bytecodealliance/wasmtime/archive/v25.0.3.tar.gz",
263261
)
264262

265263
native.bind(

0 commit comments

Comments
 (0)