Skip to content

Commit fe48606

Browse files
committed
Ensure build scripts and dev features account for getrandom config
1 parent 5340049 commit fe48606

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ jobs:
222222
with:
223223
target: wasm32-unknown-unknown
224224
- name: Check wasm
225+
env:
226+
RUSTFLAGS: --cfg getrandom_backend="wasm_js"
225227
run: cargo check --target wasm32-unknown-unknown
226228

227229
build-wasm-atomics:
@@ -247,7 +249,7 @@ jobs:
247249
- name: Check wasm
248250
run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort
249251
env:
250-
RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory -D warnings"
252+
RUSTFLAGS: '-C target-feature=+atomics,+bulk-memory -D warnings --cfg getrandom_backend="wasm_js"'
251253

252254
markdownlint:
253255
runs-on: ubuntu-latest

.github/workflows/validation-jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ jobs:
112112
cd ../..
113113
114114
- name: First Wasm build
115+
env:
116+
RUSTFLAGS: --cfg getrandom_backend="wasm_js"
115117
run: |
116118
cargo build --release --example testbed_ui --target wasm32-unknown-unknown
117119

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ smol-hyper = "0.1"
582582
ureq = { version = "3.0.8", features = ["json"] }
583583

584584
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
585+
getrandom = { version = "0.3", features = ["wasm_js"] }
585586
wasm-bindgen = { version = "0.2" }
586587
web-sys = { version = "0.3", features = ["Window"] }
587588

tools/build-wasm-example/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ fn main() {
7777
sh,
7878
"cargo build {parameters...} --profile release --target wasm32-unknown-unknown --example {example}"
7979
);
80-
cmd.run().expect("Error building example");
80+
cmd.env("RUSTFLAGS", "--cfg getrandom_backend=\"wasm_js\"")
81+
.run()
82+
.expect("Error building example");
8183

8284
cmd!(
8385
sh,

0 commit comments

Comments
 (0)