Skip to content

Commit 7f1fc3c

Browse files
committed
chore: update CI, lock files and flake for no_std targets
1 parent 8d6ac17 commit 7f1fc3c

4 files changed

Lines changed: 58 additions & 23 deletions

File tree

.github/workflows/rust.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,21 @@ jobs:
159159
uses: Swatinem/rust-cache@v2
160160
- name: "Build fuzz targets"
161161
run: cd fuzz && cargo build
162+
163+
Embedded:
164+
name: Embedded build
165+
runs-on: ubuntu-latest
166+
steps:
167+
- name: "Checkout repo"
168+
uses: actions/checkout@v4
169+
- name: "Install nightly toolchain"
170+
uses: dtolnay/rust-toolchain@nightly
171+
with:
172+
components: rust-src
173+
targets: thumbv7em-none-eabihf
174+
- name: Install ARM cross compiler
175+
run: sudo apt-get update && sudo apt-get install -y gcc-arm-none-eabi
176+
- name: "Build embedded target"
177+
env:
178+
CC_thumbv7em_none_eabihf: arm-none-eabi-gcc
179+
run: cargo build -p payjoin --no-default-features --features "alloc,v2" --target thumbv7em-none-eabihf -Zbuild-std=core,alloc

Cargo-minimal.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2781,6 +2781,7 @@ dependencies = [
27812781
"bitcoin-ohttp",
27822782
"bitcoin-units",
27832783
"bitcoin_uri",
2784+
"getrandom 0.3.4",
27842785
"http",
27852786
"once_cell",
27862787
"payjoin-test-utils",

Cargo-recent.lock

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,21 +1678,21 @@ dependencies = [
16781678
"cfg-if",
16791679
"js-sys",
16801680
"libc",
1681-
"wasi 0.11.0+wasi-snapshot-preview1",
1681+
"wasi",
16821682
"wasm-bindgen",
16831683
]
16841684

16851685
[[package]]
16861686
name = "getrandom"
1687-
version = "0.3.3"
1687+
version = "0.3.4"
16881688
source = "registry+https://github.com/rust-lang/crates.io-index"
1689-
checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
1689+
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
16901690
dependencies = [
16911691
"cfg-if",
16921692
"js-sys",
16931693
"libc",
16941694
"r-efi",
1695-
"wasi 0.14.2+wasi-0.2.4",
1695+
"wasip2",
16961696
"wasm-bindgen",
16971697
]
16981698

@@ -1882,12 +1882,11 @@ dependencies = [
18821882

18831883
[[package]]
18841884
name = "http"
1885-
version = "1.3.1"
1885+
version = "1.4.0"
18861886
source = "registry+https://github.com/rust-lang/crates.io-index"
1887-
checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
1887+
checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
18881888
dependencies = [
18891889
"bytes",
1890-
"fnv",
18911890
"itoa",
18921891
]
18931892

@@ -2225,7 +2224,7 @@ version = "0.1.34"
22252224
source = "registry+https://github.com/rust-lang/crates.io-index"
22262225
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
22272226
dependencies = [
2228-
"getrandom 0.3.3",
2227+
"getrandom 0.3.4",
22292228
"libc",
22302229
]
22312230

@@ -2452,7 +2451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
24522451
checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
24532452
dependencies = [
24542453
"libc",
2455-
"wasi 0.11.0+wasi-snapshot-preview1",
2454+
"wasi",
24562455
"windows-sys 0.61.2",
24572456
]
24582457

@@ -2757,6 +2756,7 @@ dependencies = [
27572756
"bitcoin-ohttp",
27582757
"bitcoin-units",
27592758
"bitcoin_uri",
2759+
"getrandom 0.3.4",
27602760
"http",
27612761
"once_cell",
27622762
"payjoin-test-utils",
@@ -3157,7 +3157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31573157
checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
31583158
dependencies = [
31593159
"bytes",
3160-
"getrandom 0.3.3",
3160+
"getrandom 0.3.4",
31613161
"lru-slab",
31623162
"rand 0.9.1",
31633163
"ring",
@@ -3278,7 +3278,7 @@ version = "0.9.3"
32783278
source = "registry+https://github.com/rust-lang/crates.io-index"
32793279
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
32803280
dependencies = [
3281-
"getrandom 0.3.3",
3281+
"getrandom 0.3.4",
32823282
]
32833283

32843284
[[package]]
@@ -4122,7 +4122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41224122
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
41234123
dependencies = [
41244124
"fastrand",
4125-
"getrandom 0.3.3",
4125+
"getrandom 0.3.4",
41264126
"once_cell",
41274127
"rustix 1.0.7",
41284128
"windows-sys 0.59.0",
@@ -4949,7 +4949,7 @@ version = "1.19.0"
49494949
source = "registry+https://github.com/rust-lang/crates.io-index"
49504950
checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
49514951
dependencies = [
4952-
"getrandom 0.3.3",
4952+
"getrandom 0.3.4",
49534953
"js-sys",
49544954
"rand 0.9.1",
49554955
"wasm-bindgen",
@@ -4989,12 +4989,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
49894989
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
49904990

49914991
[[package]]
4992-
name = "wasi"
4993-
version = "0.14.2+wasi-0.2.4"
4992+
name = "wasip2"
4993+
version = "1.0.2+wasi-0.2.9"
49944994
source = "registry+https://github.com/rust-lang/crates.io-index"
4995-
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
4995+
checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
49964996
dependencies = [
4997-
"wit-bindgen-rt",
4997+
"wit-bindgen",
49984998
]
49994999

50005000
[[package]]
@@ -5419,13 +5419,10 @@ dependencies = [
54195419
]
54205420

54215421
[[package]]
5422-
name = "wit-bindgen-rt"
5423-
version = "0.39.0"
5422+
name = "wit-bindgen"
5423+
version = "0.51.0"
54245424
source = "registry+https://github.com/rust-lang/crates.io-index"
5425-
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
5426-
dependencies = [
5427-
"bitflags 2.6.0",
5428-
]
5425+
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
54295426

54305427
[[package]]
54315428
name = "writeable"

flake.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,24 @@
340340
AR_wasm32_unknown_unknown = "${pkgs.llvmPackages.bintools-unwrapped}/bin/llvm-ar";
341341
};
342342

343+
embeddedRustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
344+
extensions = [
345+
"rust-src"
346+
"rustfmt"
347+
"llvm-tools-preview"
348+
];
349+
targets = [ "thumbv7em-none-eabihf" ];
350+
};
351+
352+
embeddedDevShell = pkgs.mkShell {
353+
name = "embedded-dev";
354+
packages = with pkgs; [
355+
embeddedRustToolchain
356+
gcc-arm-embedded
357+
];
358+
CC_thumbv7em_none_eabihf = "arm-none-eabi-gcc";
359+
};
360+
343361
dartDevShell = pkgs.mkShell {
344362
name = "dart-dev";
345363
packages =
@@ -461,6 +479,7 @@
461479
javascript = javascriptDevShell;
462480
csharp = csharpDevShell;
463481
dart = dartDevShell;
482+
embedded = embeddedDevShell;
464483
};
465484
formatter = treefmtEval.config.build.wrapper;
466485
checks =

0 commit comments

Comments
 (0)