Skip to content

Commit 62417b0

Browse files
authored
Merge branch 'main' into bkchr-improve-load-from-db
2 parents 98bdcd1 + c113225 commit 62417b0

File tree

22 files changed

+3315
-1665
lines changed

22 files changed

+3315
-1665
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,28 @@ jobs:
7575
- run: rustup target add i686-unknown-linux-gnu
7676
# We test for both x86_64 and i686 because there is some `cfg(target_arch = "x86_64")`
7777
# conditional compilation within the source code.
78-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features
79-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features
80-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite
81-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite
82-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features std
83-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features std
84-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features std
85-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features std
86-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features wasmtime
87-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features wasmtime
88-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features std --features wasmtime
89-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features std --features wasmtime
90-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features std --features wasmtime
91-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot --locked --no-default-features --features database-sqlite --features std --features wasmtime
92-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot-light --locked --no-default-features
93-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot-light --locked --no-default-features
94-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features std
95-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features std
96-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features wasmtime
97-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features wasmtime
98-
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features std --features wasmtime
99-
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package smoldot-light --locked --no-default-features --features std --features wasmtime
78+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features
79+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features
80+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite
81+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite
82+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features std
83+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features std
84+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features std
85+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features std
86+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features wasmtime
87+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features wasmtime
88+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features std --features wasmtime
89+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features std --features wasmtime
90+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features std --features wasmtime
91+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot --locked --no-default-features --features database-sqlite --features std --features wasmtime
92+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features
93+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features
94+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features std
95+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features std
96+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features wasmtime
97+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features wasmtime
98+
- run: RUSTFLAGS=-Dwarnings cargo check --target x86_64-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features std --features wasmtime
99+
- run: RUSTFLAGS=-Dwarnings cargo check --target i686-unknown-linux-gnu --package parity-smoldot-light --locked --no-default-features --features std --features wasmtime
100100

101101
check-no-std:
102102
runs-on: ubuntu-latest
@@ -107,8 +107,8 @@ jobs:
107107
- run: rustup target add thumbv7m-none-eabi
108108
- uses: Swatinem/rust-cache@v2
109109
# We use `thumbv7m-none-eabi` as this target seems to generally work fine and doesn't support `std`. Many targets unfortunately have Rust/LLVM bugs preventing compilation.
110-
- run: RUSTFLAGS=-Dwarnings cargo build --package smoldot --locked --no-default-features --target=thumbv7m-none-eabi
111-
- run: RUSTFLAGS=-Dwarnings cargo build --package smoldot-light --locked --no-default-features --target=thumbv7m-none-eabi
110+
- run: RUSTFLAGS=-Dwarnings cargo build --package parity-smoldot --locked --no-default-features --target=thumbv7m-none-eabi
111+
- run: RUSTFLAGS=-Dwarnings cargo build --package parity-smoldot-light --locked --no-default-features --target=thumbv7m-none-eabi
112112

113113
check-rustdoc-links:
114114
runs-on: ubuntu-latest

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- uses: Swatinem/rust-cache@v2
9292
with:
9393
workspaces: ./repo -> target
94-
- run: cargo doc --verbose --all-features --no-deps --package smoldot --package smoldot-light --package smoldot-full-node
94+
- run: cargo doc --verbose --all-features --no-deps --package parity-smoldot --package parity-smoldot-light --package parity-smoldot-full-node
9595
working-directory: ./repo
9696
- run: |
9797
mkdir -p ./doc

0 commit comments

Comments
 (0)