Skip to content

Commit

Permalink
wasm: use Bazel rules from Proxy-Wasm Rust SDK. (#14292)
Browse files Browse the repository at this point in the history
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
  • Loading branch information
PiotrSikora authored Dec 7, 2020
1 parent e7323c3 commit 9aa5c75
Show file tree
Hide file tree
Showing 27 changed files with 38 additions and 1,121 deletions.
12 changes: 0 additions & 12 deletions bazel/WASM.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,5 @@
WebAssembly tests are built using [Proxy-Wasm C++ SDK] and [Proxy-Wasm Rust SDK],
as such, they bring their own set of dependencies.

## Cargo dependencies.

In order to update Cargo dependencies, please make sure that Rust and Cargo
are installed, and run this tool:

```
bash tools/update_cargo.sh
```

which will regenerate Bazel rules in `bazel/external/cargo/`.


[Proxy-Wasm C++ SDK]: https://github.com/proxy-wasm/proxy-wasm-cpp-sdk
[Proxy-Wasm Rust SDK]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk
4 changes: 2 additions & 2 deletions bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
load("@upb//bazel:repository_defs.bzl", upb_bazel_version_repository = "bazel_version_repository")
load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
load("@io_bazel_rules_rust//:workspace.bzl", "bazel_version")
load("@config_validation_pip3//:requirements.bzl", config_validation_pip_install = "pip_install")
load("@configs_pip3//:requirements.bzl", configs_pip_install = "pip_install")
load("@headersplit_pip3//:requirements.bzl", headersplit_pip_install = "pip_install")
load("@kafka_pip3//:requirements.bzl", kafka_pip_install = "pip_install")
load("@protodoc_pip3//:requirements.bzl", protodoc_pip_install = "pip_install")
load("@thrift_pip3//:requirements.bzl", thrift_pip_install = "pip_install")
load("@rules_antlr//antlr:deps.bzl", "antlr_dependencies")
load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies")

# go version for rules_go
GO_VERSION = "1.14.7"
Expand All @@ -26,9 +26,9 @@ def envoy_dependency_imports(go_version = GO_VERSION):
gazelle_dependencies()
apple_rules_dependencies()
rust_repositories()
bazel_version(name = "bazel_version")
upb_bazel_version_repository(name = "upb_bazel_version")
antlr_dependencies(472)
proxy_wasm_rust_sdk_dependencies()

custom_exec_properties(
name = "envoy_large_machine_exec_property",
Expand Down
31 changes: 0 additions & 31 deletions bazel/external/cargo/BUILD.bazel

This file was deleted.

103 changes: 0 additions & 103 deletions bazel/external/cargo/Cargo.lock

This file was deleted.

67 changes: 0 additions & 67 deletions bazel/external/cargo/Cargo.toml

This file was deleted.

132 changes: 0 additions & 132 deletions bazel/external/cargo/crates.bzl

This file was deleted.

Loading

0 comments on commit 9aa5c75

Please sign in to comment.