Skip to content

Commit

Permalink
Update Rust toolchains and tools (ledgerctl + cargo-ledger)
Browse files Browse the repository at this point in the history
  • Loading branch information
yogh333 committed Jan 2, 2025
1 parent 3f86891 commit 893d7e1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.46.0] - 2025-01-02

### Changed
- [full, legacy, dev-tools] Update Rust stable and nightly toolchains
- Bump ledgerctl version
- Bump cargo-ledger version

## [3.45.0] - 2024-12-17

### Changed
Expand Down
8 changes: 4 additions & 4 deletions full/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest

ARG RUST_STABLE_VERSION=1.75.0
ARG RUST_NIGHTLY_VERSION=nightly-2023-11-10
ARG RUST_STABLE_VERSION=1.83.0
ARG RUST_NIGHTLY_VERSION=nightly-2024-11-22

ENV RUST_STABLE=$RUST_STABLE_VERSION
ENV RUST_NIGHTLY=$RUST_NIGHTLY_VERSION
Expand Down Expand Up @@ -37,13 +37,13 @@ RUN apk add -t python_build_deps python3-dev \
libffi-dev

# Install ledgerctl, which is used by cargo ledger for loading or dumping an APDU app file.
RUN pip3 install --no-cache-dir ledgerwallet==0.5.2
RUN pip3 install --no-cache-dir ledgerwallet==0.6.0

# Cleanup, remove packages that aren't needed anymore
RUN apk del python_build_deps

# Add cargo ledger
RUN cargo +$RUST_STABLE_VERSION install --version 1.5.1 cargo-ledger
RUN cargo +$RUST_STABLE_VERSION install --version 1.6.0 cargo-ledger

# Setup cargo ledger (install JSON target files and custom link script) for nightly
RUN cargo +$RUST_NIGHTLY_VERSION ledger setup
Expand Down
6 changes: 3 additions & 3 deletions legacy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ARG DEBIAN_FRONTEND=noninteractive

ARG LLVM_VERSION=12

ARG RUST_STABLE_VERSION=1.75.0
ARG RUST_NIGHTLY_VERSION=nightly-2023-11-10
ARG RUST_STABLE_VERSION=1.83.0
ARG RUST_NIGHTLY_VERSION=nightly-2024-11-22

ENV RUST_STABLE=$RUST_STABLE_VERSION
ENV RUST_NIGHTLY=$RUST_NIGHTLY_VERSION
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN rustup component add rust-src --toolchain $RUST_STABLE_VERSION
RUN pip3 install ledgerwallet==0.4.0

# Add cargo ledger
RUN cargo +$RUST_STABLE_VERSION install --version 1.3.0 cargo-ledger
RUN cargo +$RUST_STABLE_VERSION install --version 1.6.0 cargo-ledger

# Setup cargo ledger (install JSON target files and custom link script)
RUN cargo +$RUST_NIGHTLY_VERSION ledger setup
Expand Down

0 comments on commit 893d7e1

Please sign in to comment.