From a3ebece3f041951e06fe85277eb140062b76e3a5 Mon Sep 17 00:00:00 2001 From: yhql Date: Fri, 3 May 2024 20:24:14 +0200 Subject: [PATCH 1/5] remove invalid workspace-wide configuration --- .cargo/config.toml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index a3f6ca44..00000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,18 +0,0 @@ -[target.nanos] -runner = "speculos -m nanos --display=headless" - -[target.nanox] -runner = "speculos -m nanox --display=headless" - -[target.nanosplus] -runner = "speculos -m nanosp --display=headless" - -[target.stax] -runner = "speculos --model stax --display=headless" - -[target.flex] -runner = "speculos --model flex --display=headless" - -[unstable] -build-std = ["core"] -build-std-features = ["compiler-builtins-mem"] From c1893a514db1d7441f9f9dfec9e7be71326c2f44 Mon Sep 17 00:00:00 2001 From: yhql Date: Fri, 3 May 2024 20:52:16 +0200 Subject: [PATCH 2/5] modify ci to use each member's config --- .github/workflows/ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeae778a..6bcce93f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,14 +25,15 @@ jobs: package: [include_gif, testmacro, ledger_secure_sdk_sys, ledger_device_sdk] steps: - name: Print Environment variables - run: + run: echo "The value of RUST_NIGHTLY is $RUST_NIGHTLY" - name: Clone uses: actions/checkout@v4 - name: Cargo clippy + working-directory: ${{ matrix.package }} run: | - cargo +$RUST_NIGHTLY clippy -p ${{ matrix.package }} --target ${{ matrix.target }} - + cargo +$RUST_NIGHTLY clippy --target ${{ matrix.target }} + clippy-cargo-ledger: name: Run static analysis for cargo-ledger runs-on: ubuntu-latest @@ -42,8 +43,9 @@ jobs: - name: Clone uses: actions/checkout@v4 - name: Cargo clippy for cargo-ledger + working-directory: cargo-ledger run: | - cargo +$RUST_STABLE clippy -p cargo-ledger --no-deps + cargo +$RUST_STABLE clippy --no-deps format: name: Check code formatting @@ -69,8 +71,9 @@ jobs: - name: Clone uses: actions/checkout@v4 - name: Cargo build + working-directory: ledger_device_sdk run: | - cargo +$RUST_NIGHTLY build -p ledger_device_sdk --target ${{ matrix.target }} + cargo +$RUST_NIGHTLY build --target ${{ matrix.target }} build-cargo-ledger: name: Build SDK @@ -81,8 +84,9 @@ jobs: - name: Clone uses: actions/checkout@v4 - name: Cargo build + working-directory: cargo-ledger run: | - cargo +$RUST_STABLE build -p cargo-ledger + cargo +$RUST_STABLE build test: name: Run unit and integration tests @@ -99,5 +103,6 @@ jobs: - name: Clone uses: actions/checkout@v4 - name: Unit tests + working-directory: ledger_device_sdk run: | - cargo +$RUST_NIGHTLY test -p ledger_device_sdk --target ${{ matrix.target }} --features speculos --tests + cargo +$RUST_NIGHTLY test --target ${{ matrix.target }} --features speculos --tests From 79506cbd27978b112141adb55ba6b8b4a1f6ca4e Mon Sep 17 00:00:00 2001 From: yhql Date: Fri, 3 May 2024 20:56:56 +0200 Subject: [PATCH 3/5] remove obsolete api levels from sdk's config --- ledger_device_sdk/.cargo/config.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ledger_device_sdk/.cargo/config.toml b/ledger_device_sdk/.cargo/config.toml index 759b78dc..b8e952f9 100644 --- a/ledger_device_sdk/.cargo/config.toml +++ b/ledger_device_sdk/.cargo/config.toml @@ -2,14 +2,14 @@ runner = "speculos -m nanos --display=headless" [target.nanox] -runner = "speculos -m nanox -a 5 --display=headless" +runner = "speculos -m nanox --display=headless" [target.nanosplus] -runner = "speculos -m nanosp -a 1 --display=headless" +runner = "speculos -m nanosp --display=headless" [unstable] build-std = ["core"] build-std-features = ["compiler-builtins-mem"] [build] -target = "nanosplus" \ No newline at end of file +target = "nanosplus" From ea6d86162b899d770db081deb9521f950ef0aeb3 Mon Sep 17 00:00:00 2001 From: GroM Date: Fri, 14 Jun 2024 10:43:21 +0200 Subject: [PATCH 4/5] Report global config --- ledger_device_sdk/.cargo/config.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ledger_device_sdk/.cargo/config.toml b/ledger_device_sdk/.cargo/config.toml index b8e952f9..788d7fc7 100644 --- a/ledger_device_sdk/.cargo/config.toml +++ b/ledger_device_sdk/.cargo/config.toml @@ -7,6 +7,12 @@ runner = "speculos -m nanox --display=headless" [target.nanosplus] runner = "speculos -m nanosp --display=headless" +[target.stax] +runner = "speculos --model stax --display=headless" + +[target.flex] +runner = "speculos --model flex --display=headless" + [unstable] build-std = ["core"] build-std-features = ["compiler-builtins-mem"] From 18fb1dc8cadf9ef9ff1274c5d2eb1ab5af33fa44 Mon Sep 17 00:00:00 2001 From: GroM Date: Fri, 14 Jun 2024 10:50:48 +0200 Subject: [PATCH 5/5] [ledger_device_sdk] Bump version --- Cargo.lock | 2 +- ledger_device_sdk/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 214a2777..7f6eee82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -348,7 +348,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "ledger_device_sdk" -version = "1.10.1" +version = "1.10.2" dependencies = [ "const-zero", "include_gif", diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml index c98bd48d..f0afd8d8 100644 --- a/ledger_device_sdk/Cargo.toml +++ b/ledger_device_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ledger_device_sdk" -version = "1.10.1" +version = "1.10.2" authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"] edition = "2021" license.workspace = true