diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73417387ded..6f137ef843e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -457,12 +457,14 @@ jobs: for feature in progress parallel io-pipe crc32 zlib cache-efficiency-debug; do cargo build -p gix-features --features "$feature" --target "$TARGET" done + - name: Enable wasm_js backend + if: matrix.target == 'wasm32-unknown-unknown' + run: echo RUSTFLAGS='--cfg getrandom_backend="wasm_js"' >> "$GITHUB_ENV" - name: crates with 'wasm' feature run: | set -x - for crate in gix-pack; do - cargo build -p "$crate" --features wasm --target "$TARGET" - done + cargo build -p gix-diff --no-default-features --features wasm --target "$TARGET" + cargo build -p gix-pack --features wasm --target "$TARGET" - name: gix-pack with all features (including wasm) run: cargo build -p gix-pack --all-features --target "$TARGET" diff --git a/Cargo.lock b/Cargo.lock index 8685cbf1010..20380f7a251 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1281,9 +1281,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "js-sys", @@ -1654,7 +1654,7 @@ version = "0.53.0" dependencies = [ "bstr", "document-features", - "getrandom 0.2.15", + "getrandom 0.3.3", "gix-attributes", "gix-command", "gix-filter", @@ -2868,7 +2868,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", "system-configuration", "tokio", "tower-service", @@ -3196,7 +3196,7 @@ version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", ] @@ -3899,7 +3899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" dependencies = [ "bytes", - "getrandom 0.3.2", + "getrandom 0.3.3", "lru-slab", "rand", "ring", @@ -3968,7 +3968,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", ] [[package]] @@ -4697,7 +4697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", - "getrandom 0.3.2", + "getrandom 0.3.3", "once_cell", "rustix 1.0.8", "windows-sys 0.59.0", @@ -5347,7 +5347,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/gix-diff/Cargo.toml b/gix-diff/Cargo.toml index 2bd93358f12..13731b37ad3 100644 --- a/gix-diff/Cargo.toml +++ b/gix-diff/Cargo.toml @@ -44,7 +44,7 @@ gix-traverse = { version = "^0.47.0", path = "../gix-traverse", optional = true thiserror = "2.0.0" imara-diff = { version = "0.1.8", optional = true } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } -getrandom = { version = "0.2.8", optional = true, default-features = false, features = ["js"] } +getrandom = { version = "0.3.3", optional = true, default-features = false, features = ["wasm_js"] } bstr = { version = "1.12.0", default-features = false } document-features = { version = "0.2.0", optional = true }