Skip to content

Commit

Permalink
Merge pull request #154 from LedgerHQ/yhql/fix_cargo_ledger_install
Browse files Browse the repository at this point in the history
remove invalid workspace-wide configuration
  • Loading branch information
yogh333 authored Jun 14, 2024
2 parents 07d0d02 + 18fb1dc commit 40cc4c2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 30 deletions.
18 changes: 0 additions & 18 deletions .cargo/config.toml

This file was deleted.

19 changes: 12 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ jobs:
package: [include_gif, testmacro, ledger_secure_sdk_sys, ledger_device_sdk]
steps:
- name: Print Environment variables
run:
run:
echo "The value of RUST_NIGHTLY is $RUST_NIGHTLY"
- name: Clone
uses: actions/checkout@v4
- name: Cargo clippy
working-directory: ${{ matrix.package }}
run: |
cargo +$RUST_NIGHTLY clippy -p ${{ matrix.package }} --target ${{ matrix.target }}
cargo +$RUST_NIGHTLY clippy --target ${{ matrix.target }}
clippy-cargo-ledger:
name: Run static analysis for cargo-ledger
runs-on: ubuntu-latest
Expand All @@ -42,8 +43,9 @@ jobs:
- name: Clone
uses: actions/checkout@v4
- name: Cargo clippy for cargo-ledger
working-directory: cargo-ledger
run: |
cargo +$RUST_STABLE clippy -p cargo-ledger --no-deps
cargo +$RUST_STABLE clippy --no-deps
format:
name: Check code formatting
Expand All @@ -69,8 +71,9 @@ jobs:
- name: Clone
uses: actions/checkout@v4
- name: Cargo build
working-directory: ledger_device_sdk
run: |
cargo +$RUST_NIGHTLY build -p ledger_device_sdk --target ${{ matrix.target }}
cargo +$RUST_NIGHTLY build --target ${{ matrix.target }}
build-cargo-ledger:
name: Build SDK
Expand All @@ -81,8 +84,9 @@ jobs:
- name: Clone
uses: actions/checkout@v4
- name: Cargo build
working-directory: cargo-ledger
run: |
cargo +$RUST_STABLE build -p cargo-ledger
cargo +$RUST_STABLE build
test:
name: Run unit and integration tests
Expand All @@ -99,5 +103,6 @@ jobs:
- name: Clone
uses: actions/checkout@v4
- name: Unit tests
working-directory: ledger_device_sdk
run: |
cargo +$RUST_NIGHTLY test -p ledger_device_sdk --target ${{ matrix.target }} --features speculos --tests
cargo +$RUST_NIGHTLY test --target ${{ matrix.target }} --features speculos --tests
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions ledger_device_sdk/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@
runner = "speculos -m nanos --display=headless"

[target.nanox]
runner = "speculos -m nanox -a 5 --display=headless"
runner = "speculos -m nanox --display=headless"

[target.nanosplus]
runner = "speculos -m nanosp -a 1 --display=headless"
runner = "speculos -m nanosp --display=headless"

[target.stax]
runner = "speculos --model stax --display=headless"

[target.flex]
runner = "speculos --model flex --display=headless"

[unstable]
build-std = ["core"]
build-std-features = ["compiler-builtins-mem"]

[build]
target = "nanosplus"
target = "nanosplus"
2 changes: 1 addition & 1 deletion ledger_device_sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ledger_device_sdk"
version = "1.10.1"
version = "1.10.2"
authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
edition = "2021"
license.workspace = true
Expand Down

0 comments on commit 40cc4c2

Please sign in to comment.