From f7b7a2a5067f05b8acb7955cd2dad9bbe616ce41 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Wed, 10 Apr 2024 22:56:08 +0100 Subject: [PATCH] refactor: update CI and script for one cdk crate --- .github/workflows/ci.yml | 17 +++++++---------- .github/workflows/test.yml | 3 +-- crates/cdk/Cargo.toml | 4 ++-- misc/scripts/check-crates.sh | 9 ++++----- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa7c66e5..95fbbde4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,14 +26,12 @@ jobs: - version: stable build-args: [ - -p cashu, - -p cashu --no-default-features, - -p cashu --no-default-features --features wallet, - -p cashu --no-default-features --features mint, - -p cashu --no-default-features --features all-nuts, - -p cashu-sdk, - -p cashu-sdk --no-default-features, - -p cashu-sdk --no-default-features --features all-nuts, + -p cdk, + -p cdk --no-default-features, + -p cdk --no-default-features --features wallet, + -p cdk --no-default-features --features mint --features redb, + -p cdk --no-default-features --features mint --features redb, + -p cdk --no-default-features --features all-nuts, ] steps: - name: Checkout @@ -64,8 +62,7 @@ jobs: - version: stable build-args: [ - -p cashu, - -p cashu-sdk, + -p cdk, ] steps: - name: Checkout diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9ae2fe9..a89f3274 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,7 @@ jobs: - version: stable build-args: [ - -p cashu, - -p cashu-sdk, + -p cdk, ] steps: - name: Checkout Crate diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml index 6673fd5b..983928bd 100644 --- a/crates/cdk/Cargo.toml +++ b/crates/cdk/Cargo.toml @@ -26,7 +26,7 @@ bitcoin = { version = "0.30", features = ["serde", "rand", "rand-std"] } # light lightning-invoice = { version = "0.29", features = ["serde"] } once_cell = "1.19" serde = { version = "1.0.160", default-features = false, features = ["derive"]} -serde_json = { version = "1.0.96", default-features = false } +serde_json = "1.0.96" serde_with = "3.4" url = "2.3.1" tracing = { version = "0.1", default-features = false } @@ -43,7 +43,7 @@ redb = { version = "2.0.0", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] tokio = { workspace = true, features = ["rt", "macros", "sync", "time"] } -getrandom = { version = "0.2.14" } +getrandom = { version = "0.2.14", features = ["js"] } instant = { version = "0.1", features = [ "wasm-bindgen", "inaccurate" ] } diff --git a/misc/scripts/check-crates.sh b/misc/scripts/check-crates.sh index 2bd8d5ea..45f9894f 100755 --- a/misc/scripts/check-crates.sh +++ b/misc/scripts/check-crates.sh @@ -24,11 +24,10 @@ fi buildargs=( "-p cashu" - "-p cashu --no-default-features" - "-p cashu --no-default-features --features wallet" - "-p cashu --no-default-features --features mint" - "-p cashu-sdk" - "-p cashu-sdk --no-default-features" + "-p cdk --no-default-features" + "-p cdk --no-default-features --features wallet" + "-p cdk --no-default-features --features mint" + "-p cdk --no-default-features --features nut13" ) for arg in "${buildargs[@]}"; do