Skip to content

Commit 3787c0b

Browse files
committed
Update CI
1 parent 6a521b4 commit 3787c0b

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ 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-
# ####################################### #
3732
cargo clippy --target ${{ matrix.target }}
3833
3934
format:
@@ -62,11 +57,6 @@ jobs:
6257
- name: Cargo build
6358
working-directory: ledger_device_sdk
6459
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-
# ####################################### #
7060
cargo build --target ${{ matrix.target }}
7161
if [[ "${{ matrix.target }}" == "nanosplus" || "${{ matrix.target }}" == "nanox" ]]; then
7262
cargo build --target ${{ matrix.target }} --features nano_nbgl;
@@ -86,17 +76,10 @@ jobs:
8676
- name: Unit tests
8777
working-directory: ledger_device_sdk
8878
run: |
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-
# ####################################### #
9579
cargo test --target ${{ matrix.target }} --features speculos,debug --tests
9680
9781
build-apps:
9882
name: Build all Rust apps
9983
uses: ./.github/workflows/reusable_build_all_apps.yml
10084
with:
10185
rust_sdk_branch: ${{ github.ref }}
102-
c_sdk_branch: API_LEVEL_24

.github/workflows/reusable_build_all_apps.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
path: ${{ matrix.app-name }}
8888
- name: Patch Cargo.toml
8989
continue-on-error: false
90+
if: ${{ inputs.rust_sdk_branch != 'master' }}
9091
run: |
9192
cd ${{ matrix.app-name }}
9293
build_directory=$(ledger-manifest --output-build-directory ledger_app.toml)
@@ -132,7 +133,7 @@ jobs:
132133
cd ${{ matrix.app-name }}
133134
build_directory=$(ledger-manifest --output-build-directory ledger_app.toml)
134135
cd $build_directory
135-
# Required as patch has a different version from what is locked in Cargo.lock
136+
# Use last published versions of the Rust SDK
136137
cargo update include_gif
137138
cargo update ledger_secure_sdk_sys
138139
cargo update ledger_device_sdk

0 commit comments

Comments
 (0)