Skip to content

Commit 6a57bb4

Browse files
PiotrSikoraPiotrSikora
authored
Merge branch 'main' into SiiiTschiii/example-tcp-re-routing
2 parents 1745d75 + 5283e57 commit 6a57bb4

26 files changed

+2195
-25
lines changed

‎.bazelrc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
# Disable Bzlmod
2-
common --noenable_bzlmod
3-
41
# Force Bazel to use --target=wasm32-wasip1
52
build --platforms=@rules_rust//rust/platform:wasi

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.1
1+
7.7.1

‎.github/workflows/rust.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,15 @@ jobs:
8787
- name: Build (wasm32-unknown-unknown)
8888
run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasm //...
8989

90+
- name: Build (wasm32-unknown-unknown/bzlmod)
91+
run: bazelisk --noworkspace_rc build --enable_bzlmod --platforms=@rules_rust//rust/platform:wasm //...
92+
9093
- name: Build (wasm32-wasip1)
9194
run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasi //...
9295

96+
- name: Build (wasm32-wasip1/bzlmod)
97+
run: bazelisk --noworkspace_rc build --enable_bzlmod --platforms=@rules_rust//rust/platform:wasi //...
98+
9399
- name: Format (buildifier)
94100
run: |
95101
buildifier -mode=check -r .
@@ -99,6 +105,9 @@ jobs:
99105
bazelisk --noworkspace_rc run --noenable_bzlmod //bazel/cargo:crates_vendor
100106
git diff --exit-code
101107
108+
- name: Format (MODULE.bazel.lock)
109+
run: bazelisk mod deps --lockfile_mode=error
110+
102111
msrv:
103112
runs-on: ubuntu-24.04
104113

@@ -127,14 +136,14 @@ jobs:
127136
run: |
128137
curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
129138
chmod +x ./rustup-init.sh
130-
./rustup-init.sh -y --default-toolchain 1.65.0
139+
./rustup-init.sh -y --default-toolchain 1.68.0
131140
rm rustup-init.sh
132141
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
133142
134143
- name: Update Rust
135144
run: |
136-
rustup toolchain install 1.65.0 --component clippy --component rustfmt
137-
rustup default 1.65.0
145+
rustup toolchain install 1.68.0 --component clippy --component rustfmt
146+
rustup default 1.68.0
138147
rustup target add wasm32-unknown-unknown
139148
rustup target add wasm32-wasi
140149
@@ -328,7 +337,7 @@ jobs:
328337
329338
- name: Install dependencies
330339
run: |
331-
cargo install cargo-outdated --version 0.16.0
340+
cargo install cargo-outdated --version 0.17.0
332341
333342
- name: Run cargo outdated (main)
334343
run: |
@@ -370,7 +379,7 @@ jobs:
370379
371380
- name: Install dependencies
372381
run: |
373-
cargo install cargo-audit --version 0.21.0
382+
cargo install cargo-audit --version 0.22.0
374383
375384
- name: Run cargo audit (main)
376385
run: |

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "proxy-wasm"
33
version = "0.2.5-dev"
44
authors = ["Piotr Sikora <piotrsikora@google.com>"]
5-
rust-version = "1.65"
5+
rust-version = "1.68"
66
description = "WebAssembly for Proxies"
77
readme = "README.md"
88
license = "Apache-2.0"

‎MODULE.bazel‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
module(
16+
name = "proxy_wasm_rust_sdk",
17+
version = "0.2.5-dev",
18+
)
19+
20+
# Regular dependencies (sorted alphabetically).
21+
bazel_dep(name = "bazel_features", version = "1.38.0")
22+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
23+
bazel_dep(name = "rules_cc", version = "0.2.14")
24+
bazel_dep(name = "rules_rust", version = "0.67.0")
25+
single_version_override(
26+
module_name = "rules_rust",
27+
patch_strip = 1,
28+
patches = [
29+
"//bazel:rules_rust.patch",
30+
],
31+
version = "0.67.0",
32+
)
33+
34+
# Configure Rust toolchain.
35+
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
36+
rust.toolchain(
37+
edition = "2018",
38+
versions = ["1.90.0"],
39+
)
40+
use_repo(rust, "rust_toolchains")
41+
42+
register_toolchains(
43+
"@rust_toolchains//:all",
44+
# Dummy C/C++ toolchains for Wasm targets.
45+
"@rules_rust//rust/private/dummy_cc_toolchain:dummy_cc_wasm32_toolchain",
46+
"@rules_rust//rust/private/dummy_cc_toolchain:dummy_cc_wasm64_toolchain",
47+
)
48+
49+
# Cargo dependencies.
50+
crates_deps = use_extension("//bazel:extensions.bzl", "crates_deps")
51+
use_repo(
52+
crates_deps,
53+
"crates_vendor",
54+
"crates_vendor__hashbrown-0.16.0",
55+
"crates_vendor__log-0.4.27",
56+
)

‎MODULE.bazel.lock‎

Lines changed: 1964 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WORKSPACE‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ load("@proxy_wasm_rust_sdk//bazel:repositories.bzl", "proxy_wasm_rust_sdk_reposi
44

55
proxy_wasm_rust_sdk_repositories()
66

7-
load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies")
7+
load("@proxy_wasm_rust_sdk//bazel:dependencies_bazel.bzl", "proxy_wasm_rust_sdk_dependencies_bazel")
88

9-
proxy_wasm_rust_sdk_dependencies()
9+
proxy_wasm_rust_sdk_dependencies_bazel()
10+
11+
load("@proxy_wasm_rust_sdk//bazel:dependencies_compat.bzl", "proxy_wasm_rust_sdk_dependencies_compat")
12+
13+
proxy_wasm_rust_sdk_dependencies_compat()
14+
15+
load("@proxy_wasm_rust_sdk//bazel:dependencies_crates.bzl", "proxy_wasm_rust_sdk_dependencies_crates")
16+
17+
proxy_wasm_rust_sdk_dependencies_crates()

‎WORKSPACE.bzlmod‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.

‎bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,16 @@ rust_library(
7373
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7474
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7575
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
76+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7677
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7778
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7879
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7980
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
81+
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
8082
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
8183
"@rules_rust//rust/platform:wasm32-wasip1": [],
84+
"@rules_rust//rust/platform:wasm32-wasip1-threads": [],
85+
"@rules_rust//rust/platform:wasm32-wasip2": [],
8286
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
8387
"@rules_rust//rust/platform:x86_64-apple-ios": [],
8488
"@rules_rust//rust/platform:x86_64-linux-android": [],

‎bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,16 @@ rust_library(
7070
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
7171
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
7272
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
73+
"@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [],
7374
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
7475
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
7576
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7677
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
78+
"@rules_rust//rust/platform:wasm32-unknown-emscripten": [],
7779
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
7880
"@rules_rust//rust/platform:wasm32-wasip1": [],
81+
"@rules_rust//rust/platform:wasm32-wasip1-threads": [],
82+
"@rules_rust//rust/platform:wasm32-wasip2": [],
7983
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
8084
"@rules_rust//rust/platform:x86_64-apple-ios": [],
8185
"@rules_rust//rust/platform:x86_64-linux-android": [],

0 commit comments

Comments
 (0)