From 16fb40c1044adf71888fe8fce98901e9a2d3ca32 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Fri, 10 Jan 2025 07:52:18 +0200 Subject: [PATCH] fix: ledger (#6737) Description --- Fixes Ledger CI builds to use spesific image Fixes ledger builds --- .github/workflows/build_ledger_wallet.yml | 3 ++- applications/minotari_ledger_wallet/wallet/Cargo.toml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_ledger_wallet.yml b/.github/workflows/build_ledger_wallet.yml index 1b702ac52d..8314a56943 100644 --- a/.github/workflows/build_ledger_wallet.yml +++ b/.github/workflows/build_ledger_wallet.yml @@ -15,6 +15,7 @@ name: Build minotari_ledger_wallet env: TS_FILENAME: "minotari_ledger_wallet" SHARUN: "shasum --algorithm 256" + DOCKER_IMAGE: "ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.43.0 " concurrency: # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix @@ -59,7 +60,7 @@ jobs: docker run --rm \ -v ".:/app" \ -w "/app/applications/minotari_ledger_wallet/wallet" \ - ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder \ + ${{env.DOCKER_IMAGE}} \ cargo ledger build ${{ matrix.ledger_target }} - name: env Setup diff --git a/applications/minotari_ledger_wallet/wallet/Cargo.toml b/applications/minotari_ledger_wallet/wallet/Cargo.toml index 353ff1688c..5c1208907e 100644 --- a/applications/minotari_ledger_wallet/wallet/Cargo.toml +++ b/applications/minotari_ledger_wallet/wallet/Cargo.toml @@ -20,6 +20,9 @@ include_gif = "1.0.1" ledger_device_sdk = "1.15" rand_core = { version = "0.6", default_features = false } zeroize = { version = "1", default-features = false } +# We dont directly use or call ledger_secure_sdk_sys, but it is a dependency of ledger_device_sdk, +# we want to force it to a lower version so that it can run on an older rust version +ledger_secure_sdk_sys = {version= "=1.5.3"} # once_cell defined here just to lock the version. Other dependencies may try to go to 1.19 which is incompatabile with # ledger at this time. 1.19 removes "atomic-polyfill" and replaces it with "portable-atomic" which can not build due to @@ -27,7 +30,7 @@ zeroize = { version = "1", default-features = false } once_cell = { version = "=1.18.0", default-features = false } [package.metadata.cargo-machete] -ignored = ["once_cell"] +ignored = ["once_cell", "ledger_secure_sdk_sys"] [profile.release] opt-level = 'z'