From fe48606f06950e53c9a4a45a9166d9a5ce886dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Rica=20Pais=20da=20Silva?= Date: Thu, 27 Feb 2025 11:41:42 +0100 Subject: [PATCH] Ensure build scripts and dev features account for getrandom config --- .github/workflows/ci.yml | 4 +++- .github/workflows/validation-jobs.yml | 2 ++ Cargo.toml | 1 + tools/build-wasm-example/src/main.rs | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37db848558..6d8f3ac860 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,6 +222,8 @@ jobs: with: target: wasm32-unknown-unknown - name: Check wasm + env: + RUSTFLAGS: --cfg getrandom_backend="wasm_js" run: cargo check --target wasm32-unknown-unknown build-wasm-atomics: @@ -247,7 +249,7 @@ jobs: - name: Check wasm run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort env: - RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory -D warnings" + RUSTFLAGS: '-C target-feature=+atomics,+bulk-memory -D warnings --cfg getrandom_backend="wasm_js"' markdownlint: runs-on: ubuntu-latest diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index 3667940857..a79aa45d11 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -112,6 +112,8 @@ jobs: cd ../.. - name: First Wasm build + env: + RUSTFLAGS: --cfg getrandom_backend="wasm_js" run: | cargo build --release --example testbed_ui --target wasm32-unknown-unknown diff --git a/Cargo.toml b/Cargo.toml index 4bc313307f..e1624398f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -582,6 +582,7 @@ smol-hyper = "0.1" ureq = { version = "3.0.8", features = ["json"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] +getrandom = { version = "0.3", features = ["wasm_js"] } wasm-bindgen = { version = "0.2" } web-sys = { version = "0.3", features = ["Window"] } diff --git a/tools/build-wasm-example/src/main.rs b/tools/build-wasm-example/src/main.rs index 1162aaece7..8f959da3a6 100644 --- a/tools/build-wasm-example/src/main.rs +++ b/tools/build-wasm-example/src/main.rs @@ -77,7 +77,9 @@ fn main() { sh, "cargo build {parameters...} --profile release --target wasm32-unknown-unknown --example {example}" ); - cmd.run().expect("Error building example"); + cmd.env("RUSTFLAGS", "--cfg getrandom_backend=\"wasm_js\"") + .run() + .expect("Error building example"); cmd!( sh,