Merge pull request #275 from LedgerHQ/y333/update_ci

Update CI

Author: yogh333

.github/workflows/ci.yml

@@ -29,11 +29,6 @@ jobs:
       - name: Cargo clippy
         working-directory: ${{ matrix.package }}
         run: |
-          # to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
-          git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
-          echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
-          export LEDGER_SDK_PATH=$(realpath c_sdk)
-          # ####################################### #
           cargo clippy --target ${{ matrix.target }}
 
   format:
@@ -62,11 +57,6 @@ jobs:
       - name: Cargo build
         working-directory: ledger_device_sdk
         run: |
-          # to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
-          git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
-          echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
-          export LEDGER_SDK_PATH=$(realpath c_sdk)
-          # ####################################### #
           cargo build --target ${{ matrix.target }}
           if [[ "${{ matrix.target }}" == "nanosplus" || "${{ matrix.target }}" == "nanox" ]]; then
             cargo build --target ${{ matrix.target }} --features nano_nbgl;
@@ -86,17 +76,10 @@ jobs:
       - name: Unit tests
         working-directory: ledger_device_sdk
         run: |
-          # to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
-          git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
-          echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
-          export LEDGER_SDK_PATH=$(realpath c_sdk)
-          pip install -U speculos --break-system-packages
-          # ####################################### #
           cargo test --target ${{ matrix.target }} --features speculos,debug --tests
 
   build-apps:
     name: Build all Rust apps
     uses: ./.github/workflows/reusable_build_all_apps.yml
     with:
       rust_sdk_branch: ${{ github.ref }}
-      c_sdk_branch: API_LEVEL_24

.github/workflows/reusable_build_all_apps.yml

@@ -9,7 +9,7 @@ on:
           type: string
         rust_sdk_branch:
           required: false
-          default: 'master'
+          default: ''
           type: string
     workflow_dispatch:
       inputs:
@@ -19,7 +19,7 @@ on:
           type: string
         rust_sdk_branch:
           required: false
-          default: 'master'
+          default: ''
           type: string
 
 env:
@@ -36,7 +36,7 @@ jobs:
           uses: actions/checkout@v4
           with:
             repository: LedgerHQ/ledger-device-rust-sdk
-            ref: ${{ inputs.rust_sdk_branch }}
+            ref: 'master'
         - name: Set up Python
           uses: actions/setup-python@v4
           with:
@@ -74,6 +74,7 @@ jobs:
             - name: Install ledgered
               run: pip install ledgered --break-system-packages
             - name: Clone SDK
+              if: ${{ inputs.rust_sdk_branch != '' }}
               uses: actions/checkout@v4
               with:
                 path: sdk
@@ -87,6 +88,7 @@ jobs:
                 path: ${{ matrix.app-name }}
             - name: Patch Cargo.toml
               continue-on-error: false
+              if: ${{ inputs.rust_sdk_branch != '' }}
               run: |
                 cd ${{ matrix.app-name }}
                 build_directory=$(ledger-manifest --output-build-directory ledger_app.toml)
@@ -132,7 +134,7 @@ jobs:
                 cd ${{ matrix.app-name }}
                 build_directory=$(ledger-manifest --output-build-directory ledger_app.toml)
                 cd $build_directory
-                # Required as patch has a different version from what is locked in Cargo.lock
+                # Use last published versions of the Rust SDK
                 cargo update include_gif
                 cargo update ledger_secure_sdk_sys
                 cargo update ledger_device_sdk