Skip to content

Commit

Permalink
build: update rules_rust to allow Rustc in RBE (envoyproxy#13595)
Browse files Browse the repository at this point in the history
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
  • Loading branch information
lizan authored and PiotrSikora committed Nov 19, 2020
1 parent cd87e82 commit 6782c85
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ build:remote --spawn_strategy=remote,sandboxed,local
build:remote --strategy=Javac=remote,sandboxed,local
build:remote --strategy=Closure=remote,sandboxed,local
build:remote --strategy=Genrule=remote,sandboxed,local
# rules_rust is not remote runnable (yet)
build:remote --strategy=Rustc=sandboxed,local
build:remote --remote_timeout=7200
build:remote --auth_enabled=true
build:remote --remote_download_toplevel
Expand Down
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -904,14 +904,14 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
project_name = "Bazel rust rules",
project_desc = "Bazel rust rules (used by Wasm)",
project_url = "https://github.com/bazelbuild/rules_rust",
version = "fda9a1ce6482973adfda022cadbfa6b300e269c3",
sha256 = "484a2b2b67cd2d1fa1054876de7f8d291c4b203fd256bc8cbea14d749bb864ce",
version = "fb90a7484800157fbb8a5904fbeb608dc1effc0c",
sha256 = "cbb253b8c5ab1a3c1787790f900e7d6774e95ba038714fc0f710935e62f30f5f",
# Last commit where "out_binary = True" works.
# See: https://github.com/bazelbuild/rules_rust/issues/386
strip_prefix = "rules_rust-{version}",
urls = ["https://github.com/bazelbuild/rules_rust/archive/{version}.tar.gz"],
use_category = ["build"],
last_updated = "2020-07-29",
use_category = ["test_only"],
last_updated = "2020-10-15",
),
rules_antlr = dict(
project_name = "ANTLR Rules for Bazel",
Expand Down
2 changes: 1 addition & 1 deletion bazel/wasm/wasm.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def envoy_wasm_cc_binary(name, tags = [], **kwargs):
wasm_cc_binary(name, tags, repository = "@envoy", **kwargs)

def wasm_rust_binary(name, tags = [], **kwargs):
wasm_name = "_wasm_" + (name if not ".wasm" in name else name.strip(".wasm"))
wasm_name = "_wasm_" + name.replace(".", "_")
kwargs.setdefault("visibility", ["//visibility:public"])

rust_binary(
Expand Down

0 comments on commit 6782c85

Please sign in to comment.