Skip to content

Commit 6a521b4

Browse files
authored
Merge pull request #266 from LedgerHQ/pr-io-revamp
Pr io revamp
2 parents af0a79a + d927290 commit 6a521b4

File tree

19 files changed

+398
-574
lines changed

19 files changed

+398
-574
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
- name: Cargo clippy
3030
working-directory: ${{ matrix.package }}
3131
run: |
32+
# to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
33+
git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
34+
echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
35+
export LEDGER_SDK_PATH=$(realpath c_sdk)
36+
# ####################################### #
3237
cargo clippy --target ${{ matrix.target }}
3338
3439
format:
@@ -57,7 +62,15 @@ jobs:
5762
- name: Cargo build
5863
working-directory: ledger_device_sdk
5964
run: |
65+
# to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
66+
git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
67+
echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
68+
export LEDGER_SDK_PATH=$(realpath c_sdk)
69+
# ####################################### #
6070
cargo build --target ${{ matrix.target }}
71+
if [[ "${{ matrix.target }}" == "nanosplus" || "${{ matrix.target }}" == "nanox" ]]; then
72+
cargo build --target ${{ matrix.target }} --features nano_nbgl;
73+
fi
6174
6275
test:
6376
name: Run unit and integration tests
@@ -73,10 +86,17 @@ jobs:
7386
- name: Unit tests
7487
working-directory: ledger_device_sdk
7588
run: |
76-
cargo test --target ${{ matrix.target }} --features speculos --tests
89+
# to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
90+
git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
91+
echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
92+
export LEDGER_SDK_PATH=$(realpath c_sdk)
93+
pip install -U speculos --break-system-packages
94+
# ####################################### #
95+
cargo test --target ${{ matrix.target }} --features speculos,debug --tests
7796
7897
build-apps:
7998
name: Build all Rust apps
8099
uses: ./.github/workflows/reusable_build_all_apps.yml
81100
with:
82101
rust_sdk_branch: ${{ github.ref }}
102+
c_sdk_branch: API_LEVEL_24

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ledger_device_sdk/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ledger_device_sdk"
3-
version = "1.22.14"
3+
version = "1.23.0"
44
authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
55
edition = "2021"
66
license.workspace = true
@@ -21,7 +21,7 @@ rand_core = { version = "0.6.3", default-features = false }
2121
zeroize = { version = "1.6.0", default-features = false }
2222
numtoa = "0.2.4"
2323
const-zero = "0.1.1"
24-
ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.8.3" }
24+
ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.9.0" }
2525

2626
[features]
2727
debug = []

ledger_device_sdk/src/ble.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)