Skip to content

Y333/rust build override nightly #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yogh333 merged 1 commit into from
Jan 8, 2026
Merged

Y333/rust build override nightly #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/reusable_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ jobs:
then
BUILD_DEVICE_NAME="$(echo "${{ matrix.device }}" | sed 's/nanosp/nanosplus/')"
# Update the Rust SDK crate
cargo update ledger_device_sdk
cargo +$RUST_NIGHTLY update ledger_device_sdk
# Build application
cargo ledger build "${BUILD_DEVICE_NAME}" -- ${CARGO_LEDGER_BUILD_ARGS}
binary_path=$(cargo metadata --no-deps --format-version 1 | jq -r '.target_directory')
cargo +$RUST_NIGHTLY ledger build "${BUILD_DEVICE_NAME}" -- ${CARGO_LEDGER_BUILD_ARGS}
binary_path=$(cargo +$RUST_NIGHTLY metadata --no-deps --format-version 1 | jq -r '.target_directory')
echo "binary_path=${binary_path}" >> "${GITHUB_OUTPUT}"
else
echo "Using BOLOS_SDK: ${BOLOS_SDK}"
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
echo "C_DEVICE_NAME=$C_DEVICE_NAME"
RUST_DEVICE_NAME="$(echo "${{ matrix.device }}" | sed 's/sp/splus/')"
echo "RUST_DEVICE_NAME=$RUST_DEVICE_NAME"
ELF_NAME=$(cargo metadata --manifest-path ${{ needs.call_get_app_metadata.outputs.build_directory }}/Cargo.toml --no-deps --format-version 1 | jq -r '.packages[] | select(.metadata.ledger != null) | .name')
ELF_NAME=$(cargo +$RUST_NIGHTLY metadata --manifest-path ${{ needs.call_get_app_metadata.outputs.build_directory }}/Cargo.toml --no-deps --format-version 1 | jq -r '.packages[] | select(.metadata.ledger != null) | .name')
echo "ELF_NAME=$ELF_NAME"
mv "${{ steps.build.outputs.binary_path }}/${RUST_DEVICE_NAME}/release/${ELF_NAME}" "${{ steps.build.outputs.binary_path }}/${UPLOAD_AS_LIB_ARTIFACT}_${C_DEVICE_NAME}.elf"
rm -rf "${{ steps.build.outputs.binary_path }}/${RUST_DEVICE_NAME}"
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ 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).

## [1.91.1] - 2026-01-08

### Fixed

- Override nightly version when building Rust apps

## [1.91.0] - 2026-01-07

### Added
Expand Down
2 changes: 1 addition & 1 deletion scripts/cargo_metadata_dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def save_app_params(device: str, app_build_path: Path, json_path: Path) -> None:
metadata = run_cmd("cargo metadata --no-deps --format-version 1 --offline -q",
metadata = run_cmd("cargo +$RUST_NIGHTLY metadata --no-deps --format-version 1 --offline -q",
cwd=app_build_path)
metadata = json.loads(metadata)

Expand Down
4 changes: 2 additions & 2 deletions scripts/check_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ call_step() {
log_bold "********* Processing target: ${TARGET}"
eval BOLOS_SDK="$(echo "\$${TARGET}" | sed 's/[2+]/p/' | tr '[:lower:]' '[:upper:]')_SDK"
if [[ "${IS_RUST}" == true ]]; then
COMMAND="(cd ${APP_DIR}/${BUILD_DIR} && cargo clippy --target ${TARGET/nanosp/nanosplus} -- -Dwarnings)"
COMMAND="(cd ${APP_DIR}/${BUILD_DIR} && cargo +$RUST_NIGHTLY clippy --target ${TARGET/nanosp/nanosplus} -- -Dwarnings)"
else
COMMAND="make ${make_option[*]} ENABLE_SDK_WERROR=1 scan-build"
fi
Expand All @@ -228,7 +228,7 @@ call_step() {
log_bold "********* Processing target: ${tgt}"
eval BOLOS_SDK="$(echo "\$${tgt}" | tr '[:lower:]' '[:upper:]')_SDK"
if [[ "${IS_RUST}" == true ]]; then
COMMAND="(cd ${APP_DIR}/${BUILD_DIR} && cargo clippy --target ${tgt/nanosp/nanosplus} -- -Dwarnings)"
COMMAND="(cd ${APP_DIR}/${BUILD_DIR} && cargo +$RUST_NIGHTLY clippy --target ${tgt/nanosp/nanosplus} -- -Dwarnings)"
else
COMMAND="make ${make_option[*]} ENABLE_SDK_WERROR=1 scan-build"
fi
Expand Down
Loading