Skip to content

Commit ce61e43

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/wasm-node/javascript/typescript-5.6.3
2 parents 852414a + 9df80e7 commit ce61e43

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ jobs:
5757
- uses: Swatinem/rust-cache@v2
5858
- uses: actions/setup-node@v4.0.3
5959
with:
60-
node-version: '16' # An old version is used to ensure compatibility
61-
- uses: denoland/setup-deno@v1
60+
# Set to the oldest version still maintained, in order to ensure compatibility. See <https://nodejs.dev/en/about/releases/>
61+
node-version: '18'
62+
- uses: denoland/setup-deno@v2
6263
with:
6364
deno-version: v1.x
6465
- run: cd wasm-node/javascript && RUSTFLAGS=-Dwarnings npm install-ci-test

.github/workflows/deploy.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ jobs:
180180
- run: rustup target add wasm32-unknown-unknown
181181
- uses: actions/setup-node@v4.0.3
182182
with:
183-
# Set the oldest version still maintained, in order to ensure compatibility. See <https://nodejs.dev/en/about/releases/>
184-
node-version: 16
183+
# Set to the oldest version still maintained, in order to ensure compatibility. See <https://nodejs.dev/en/about/releases/>
184+
node-version: 18
185185
- uses: Swatinem/rust-cache@v2
186186
- run: npm install
187187
working-directory: ./wasm-node/javascript
@@ -209,8 +209,9 @@ jobs:
209209
- run: rustup target add wasm32-unknown-unknown
210210
- uses: actions/setup-node@v4.0.3
211211
with:
212-
node-version: 16
213-
- uses: denoland/setup-deno@v1
212+
# Set to the oldest version still maintained, in order to ensure compatibility. See <https://nodejs.dev/en/about/releases/>
213+
node-version: 18
214+
- uses: denoland/setup-deno@v2
214215
with:
215216
deno-version: v1.x
216217
# TODO: do not use `actions-rs/toolchain` but instead use `image: rust:...` like all the other stages; unfortunately this causes incomprehensible `detected dubious ownership in repository` git errors

Cargo.lock

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

full-node/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fnv = { version = "1.0.7", default-features = false }
2626
futures-channel = "0.3.31"
2727
futures-lite = { version = "2.3.0", default-features = false, features = ["alloc"] }
2828
futures-util = { version = "0.3.27", default-features = false }
29-
hashbrown = { version = "0.14.0", default-features = false }
29+
hashbrown = { version = "0.15.0", default-features = false }
3030
hex = { version = "0.4.3", default-features = false }
3131
humantime = { version = "2.1.0", default-features = false }
3232
lru = { version = "0.12.0", default-features = false, features = ["hashbrown"] }
@@ -38,5 +38,5 @@ siphasher = { version = "1.0.1", default-features = false }
3838
soketto = { version = "0.8.0", features = ["deflate"] }
3939
smol = "2.0.0"
4040
smoldot = { version = "0.18.0", path = "../lib", default-features = false, features = ["database-sqlite", "std", "wasmtime"] }
41-
terminal_size = "0.3.0"
41+
terminal_size = "0.4.0"
4242
zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }

lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ either = { version = "1.9.0", default-features = false }
5050
event-listener = { version = "5.3.0", default-features = false }
5151
fnv = { version = "1.0.7", default-features = false }
5252
futures-lite = { version = "2.3.0", default-features = false, features = ["alloc"] }
53-
hashbrown = { version = "0.14.0", default-features = false, features = ["serde"] } # TODO: remove serde feature
53+
hashbrown = { version = "0.15.0", default-features = false, features = ["raw-entry", "serde"] } # TODO: remove serde feature
5454
hex = { version = "0.4.3", default-features = false }
5555
hmac = { version = "0.12.1", default-features = false }
5656
itertools = { version = "0.13.0", default-features = false }

light-base/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fnv = { version = "1.0.7", default-features = false }
2525
futures-channel = { version = "0.3.31", default-features = false, features = ["alloc"] }
2626
futures-lite = { version = "2.3.0", default-features = false, features = ["alloc"] }
2727
futures-util = { version = "0.3.27", default-features = false, features = ["alloc", "sink"] } # TODO: slim down these features and consider removing this dependency altogether
28-
hashbrown = { version = "0.14.0", default-features = false }
28+
hashbrown = { version = "0.15.0", default-features = false }
2929
hex = { version = "0.4.3", default-features = false }
3030
itertools = { version = "0.13.0", default-features = false, features = ["use_alloc"] }
3131
lru = { version = "0.12.0", default-features = false, features = ["hashbrown"] } # The `hashbrown` feature brings no-std compatibility.

wasm-node/rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ event-listener = { version = "5.3.0", default-features = false }
2525
fnv = { version = "1.0.7", default-features = false }
2626
futures-lite = { version = "2.3.0", default-features = false, features = ["alloc"] }
2727
futures-util = { version = "0.3.27", default-features = false }
28-
hashbrown = { version = "0.14.0", default-features = false }
28+
hashbrown = { version = "0.15.0", default-features = false }
2929
nom = { version = "7.1.3", default-features = false }
3030
pin-project = "1.1.5"
3131
slab = { version = "0.4.8", default-features = false }

0 commit comments

Comments
 (0)