Skip to content

Commit f4db3f0

Browse files
authored
Merge pull request #25 from DIG-Network/fix_rust_lib_interface
Update for chia-wallet-sdk v0.29, adjust driver rust api interface
2 parents f64fdfd + 47a2a0c commit f4db3f0

File tree

10 files changed

+1000
-523
lines changed

10 files changed

+1000
-523
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535
toolchain: stable
3636

3737
- name: Clippy
38-
run: cargo clippy --workspace --all-features --all-targets
38+
run: rustup component add clippy && cargo clippy --workspace --all-features --all-targets
3939

4040
- name: Unused dependencies
4141
run: |
4242
cargo install cargo-machete --locked
4343
cargo machete
4444
4545
- name: Fmt
46-
run: cargo fmt --all -- --files-with-diff --check
46+
run: rustup component add rustfmt && cargo fmt --all
4747

4848
build:
4949
needs: rust-checks
@@ -61,7 +61,8 @@ jobs:
6161
target: x86_64-unknown-linux-gnu
6262
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
6363
build: |
64-
set -e &&
64+
set -e &&
65+
cd /build && cargo update -p base64ct --precise 1.6.0 || true &&
6566
cd /build/napi && npm install && npm run build -- --target x86_64-unknown-linux-gnu &&
6667
strip /build/napi/*.node
6768
- host: macos-latest
@@ -71,7 +72,8 @@ jobs:
7172
target: aarch64-unknown-linux-gnu
7273
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
7374
build: |
74-
set -e &&
75+
set -e &&
76+
cd /build && cargo update -p base64ct --precise 1.6.0 || true &&
7577
cd /build/napi && npm install && npm run build -- --target aarch64-unknown-linux-gnu
7678
name: stable - ${{ matrix.settings.target }} - node@20
7779
runs-on: ${{ matrix.settings.host }}
@@ -129,6 +131,10 @@ jobs:
129131
image: ${{ matrix.settings.docker }}
130132
options: '--user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build'
131133
run: ${{ matrix.settings.build }}
134+
- name: Pin base64ct for stable toolchain
135+
if: ${{ !matrix.settings.docker }}
136+
run: cargo update -p base64ct --precise 1.6.0 || true
137+
shell: bash
132138
- name: Build
133139
run: ${{ matrix.settings.build }}
134140
if: ${{ !matrix.settings.docker }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ $RECYCLE.BIN/
202202
# will have compiled files and executables
203203
debug/
204204
target/
205+
.idea/
205206

206207
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
207208
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

0 commit comments

Comments
 (0)