Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wasm: use Bazel rules from Proxy-Wasm Rust SDK. #14292

Merged
merged 1 commit into from
Dec 7, 2020
Merged

wasm: use Bazel rules from Proxy-Wasm Rust SDK. #14292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions bazel/WASM.md
View file
Open in desktop
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
View file
Open in desktop
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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't figure out what's the difference between bazel/dependency_imports.bzl and bazel/repositories_extra.bzl, so let me know if I should move proxy_wasm_rust_sdk_dependencies() elsewhere.

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
View file
Open in desktop

This file was deleted.

103 changes: 0 additions & 103 deletions bazel/external/cargo/Cargo.lock
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions bazel/external/cargo/Cargo.toml
View file
Open in desktop

This file was deleted.

132 changes: 0 additions & 132 deletions bazel/external/cargo/crates.bzl
View file
Open in desktop

This file was deleted.

Loading